diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-08 11:36:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-08 11:31:36 +0100 |
| commit | 2ab40e9ecc9092e2227a30e43a7fc319f8632a17 (patch) | |
| tree | 4a81335b8b08e02273ad32ec39da6f92e2469740 /avmedia | |
| parent | 7cbc8a8d866225f513b90b69bcc29cb6f230d65b (diff) | |
use more OUStringLiteral in MediaDescriptor
Change-Id: I0567d103db8db401c737fed98483912a39352929
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124835
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/soundhandler.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 0724a2729150..07bee2113358 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -172,7 +172,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL& //close streams otherwise on windows we can't reopen the file in the //media player when we pass the url to directx as it'll already be open css::uno::Reference< css::io::XInputStream > xInputStream = - aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_INPUTSTREAM(), + aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_INPUTSTREAM, css::uno::Reference< css::io::XInputStream >()); if (xInputStream.is()) xInputStream->closeInput(); } @@ -192,7 +192,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL& try { m_bError = false; - m_xPlayer.set( avmedia::MediaWindow::createPlayer( aURL.Complete, aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(), OUString()) ), css::uno::UNO_SET_THROW ); + m_xPlayer.set( avmedia::MediaWindow::createPlayer( aURL.Complete, aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER, OUString()) ), css::uno::UNO_SET_THROW ); // OK- we can start async playing ... // Count this request and initialize self-holder against dying by uno ref count ... m_xSelfHold.set(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); @@ -243,8 +243,8 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property // Analyze given descriptor to find filename or input stream or ... utl::MediaDescriptor aDescriptor(lDescriptor); - OUString sURL = aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString()); - OUString sReferer = aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(), OUString()); + OUString sURL = aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL, OUString()); + OUString sReferer = aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER, OUString()); if ( !sURL.isEmpty() && @@ -256,7 +256,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property // a) look for given extension of url to map our type decision HARD CODED!!! // b) return preferred type every time... it's easy :-) sTypeName = "wav_Wave_Audio_File"; - aDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName; + aDescriptor[utl::MediaDescriptor::PROP_TYPENAME] <<= sTypeName; aDescriptor >> lDescriptor; } |