summaryrefslogtreecommitdiffstats
path: root/avmedia/source/framework/soundhandler.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'avmedia/source/framework/soundhandler.cxx')
-rw-r--r--avmedia/source/framework/soundhandler.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 7d26c252201b..d3cc8b724d39 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -85,14 +85,12 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes()
return aTypeCollection.getTypes();
}
-constexpr OUStringLiteral IMPLEMENTATIONNAME_SOUNDHANDLER = u"com.sun.star.comp.framework.SoundHandler";
-
/*===========================================================================================================*/
/* XServiceInfo */
/*===========================================================================================================*/
OUString SAL_CALL SoundHandler::getImplementationName()
{
- return IMPLEMENTATIONNAME_SOUNDHANDLER;
+ return u"com.sun.star.comp.framework.SoundHandler"_ustr;
}
// XServiceInfo
@@ -104,7 +102,7 @@ sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName )
// XServiceInfo
css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames()
{
- return { "com.sun.star.frame.ContentHandler" };
+ return { u"com.sun.star.frame.ContentHandler"_ustr };
}
/*-************************************************************************************************************
@@ -144,7 +142,7 @@ SoundHandler::~SoundHandler()
@short try to load audio file
@descr This method try to load given audio file by URL and play it. We use vcl/Sound class to do that.
- Playing of sound is asynchron every time.
+ Playing of sound is asynchronous every time.
@attention We must hold us alive by ourself ... because we use async. vcl sound player ... but playing is started
in async interface call "dispatch()" too. And caller forget us immediately. But then our uno ref count
@@ -195,7 +193,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL&
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);
+ m_xSelfHold.set(getXWeak());
m_xPlayer->start();
m_aUpdateIdle.SetPriority( TaskPriority::HIGH_IDLE );
m_aUpdateIdle.Start();
@@ -255,7 +253,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property
// I think we can the following ones:
// 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";
+ sTypeName = u"wav_Wave_Audio_File"_ustr;
aDescriptor[utl::MediaDescriptor::PROP_TYPENAME] <<= sTypeName;
aDescriptor >> lDescriptor;
}