diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-18 09:39:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-18 19:49:53 +0100 |
| commit | 4c72b9d08afbb3c503c33b37771f1dc8968df1bb (patch) | |
| tree | 0f5ccf813d3fc464bd932a3322a18d3f2e084bd3 /avmedia | |
| parent | fcba66fa86a77a3ca86705a4f145f8aae198ff87 (diff) | |
use more cppu::BaseMutex
Change-Id: I9defebeb9cb0ba22df3578c8aae7501add36a11c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127078
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/soundhandler.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/framework/soundhandler.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 07bee2113358..7d26c252201b 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -164,7 +164,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL& const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) { // SAFE { - const ::osl::MutexGuard aLock( GetMutex() ); + const ::osl::MutexGuard aLock( m_aMutex ); utl::MediaDescriptor aDescriptor(lDescriptor); @@ -276,7 +276,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify, Timer *, void) { // SAFE { - ::osl::ClearableMutexGuard aLock( GetMutex() ); + ::osl::ClearableMutexGuard aLock( m_aMutex ); if (m_xPlayer.is() && m_xPlayer->isPlaying() && m_xPlayer->getMediaTime() < m_xPlayer->getDuration()) { diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index 5575bba1876c..648cbe59dd4b 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -29,12 +29,12 @@ #include <com/sun/star/lang/XServiceInfo.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/weak.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> #include <tools/link.hxx> -#include <toolkit/helper/mutexhelper.hxx> namespace avmedia{ @@ -56,7 +56,7 @@ class SoundHandler : // interfaces , public css::document::XExtendedFilterDetection // baseclasses // Order is necessary for right initialization! - , private MutexHelper + , private cppu::BaseMutex , public ::cppu::OWeakObject { // public methods |