[Libreoffice-commits] core.git: avmedia/source

Arnaud Versini Arnaud.Versini at libreoffice.org
Sun May 7 17:40:07 UTC 2017


 avmedia/source/gstreamer/gstwindow.cxx |   19 -------------------
 1 file changed, 19 deletions(-)

New commits:
commit fa19a1f0b050ee6c2ba1f314360e8a2536f61396
Author: Arnaud Versini <Arnaud.Versini at libreoffice.org>
Date:   Sun May 7 14:25:41 2017 +0200

    avmedia: remove useless mutex and lock
    
    Change-Id: Ia6088fdb8734acb76c38067246fa626ddf964f8e
    Reviewed-on: https://gerrit.libreoffice.org/37344
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 948fff012d0c..dace006253fb 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -31,24 +31,6 @@ using namespace ::com::sun::star;
 
 namespace avmedia { namespace gstreamer {
 
-static ::osl::Mutex& ImplGetOwnStaticMutex()
-{
-    static ::osl::Mutex* pMutex = nullptr;
-
-    if( pMutex == nullptr )
-    {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-
-        if( pMutex == nullptr )
-        {
-            static ::osl::Mutex aMutex;
-            pMutex = &aMutex;
-        }
-    }
-
-    return *pMutex;
-}
-
 // Window
 
 
@@ -56,7 +38,6 @@ Window::Window() :
     meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ),
     mnPointerType( awt::SystemPointer::ARROW )
 {
-    ::osl::MutexGuard aGuard( ImplGetOwnStaticMutex() );
 }
 
 Window::~Window()


More information about the Libreoffice-commits mailing list