1 files changed, 12 insertions, 16 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 0793eaf8caf2..2127e87a93ec 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -46,6 +46,8 @@ typedef struct _GOptionGroup GOptionGroup;
 
 #include <gst/gst.h>
 #include "com/sun/star/media/XPlayer.hdl"
+#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/basemutex.hxx>
 
 namespace avmedia
 {
@@ -56,10 +58,11 @@ class Window;
 // ---------------
 // - Player_Impl -
 // ---------------
+typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::media::XPlayer,
+                                          ::com::sun::star::lang::XServiceInfo > Player_BASE;
 
-class Player : public ::cppu::WeakImplHelper3< ::com::sun::star::media::XPlayer,
-                                               ::com::sun::star::lang::XComponent,
-                                               ::com::sun::star::lang::XServiceInfo >
+class Player :  public cppu::BaseMutex,
+                public Player_BASE
 {
 public:
 
@@ -67,7 +70,7 @@ public:
     static Player* create( const ::rtl::OUString& rURL );
 
     ~Player();
-
+//protected:
     // XPlayer
     virtual void SAL_CALL start()
      throw( ::com::sun::star::uno::RuntimeException );
@@ -127,18 +130,6 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber()
      throw( ::com::sun::star::uno::RuntimeException );
 
-    // XComponent
-    virtual void SAL_CALL dispose()
-     throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual void SAL_CALL addEventListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
-     throw( ::com::sun::star::uno::RuntimeException );
-
-    virtual void SAL_CALL removeEventListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
-     throw( ::com::sun::star::uno::RuntimeException );
-
     // XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName()
      throw( ::com::sun::star::uno::RuntimeException );
@@ -150,6 +141,7 @@ public:
      throw( ::com::sun::star::uno::RuntimeException );
 
 // these are public because the C callbacks call them
+
     virtual gboolean busCallback( GstBus* pBus,
                                   GstMessage* pMsg );
 
@@ -162,6 +154,9 @@ public:
 
 protected:
 
+    // ::cppu::OComponentHelper
+    virtual void SAL_CALL disposing(void);
+
     Player( GString* pURI = NULL );
 
     void implQuitThread();
@@ -173,6 +168,7 @@ protected:
         return( g_atomic_int_get( &mnInitialized ) > 0 );
     }
 
+    static gpointer implThreadFunc( gpointer pData );
 
 private: