avmedia: fix gstreamer build breakage:

pass parameter pURI to base class ctor
(was caused by conflicting changes in solaris11 and impress210)

3 files changed, 8 insertions, 11 deletions

diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index daf64d80ed25..357197cf8ccd 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -45,18 +45,12 @@ const gulong GRAB_TIMEOUT = 10000000;
 // ----------------
 
 FrameGrabber::FrameGrabber( GString* pURI ) :
+    FrameGrabber_BASE(pURI),
     mpFrameMutex( g_mutex_new() ),
     mpFrameCond( g_cond_new() ),
     mpLastPixbuf( NULL ),
     mbIsInGrabMode( false )
 {
-    if( pURI )
-    {
-        OSL_TRACE( ">>> --------------------------------" );
-        OSL_TRACE( ">>> Creating Player object with URL: %s", pURI->str );
-
-        mpThread = g_thread_create( Player::implThreadFunc, this, true, NULL );
-    }
 }
 
 // ------------------------------------------------------------------------------
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index fac2e298fb2c..05b256381a8a 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -42,8 +42,13 @@ namespace avmedia { namespace gst {
 // - FrameGrabber -
 // ----------------
 
-class FrameGrabber :
-                     public ::cppu::ImplInheritanceHelper1 < Player,::com::sun::star::media::XFrameGrabber >
+typedef ::cppu::ImplInheritanceHelper1
+<    Player
+,   ::com::sun::star::media::XFrameGrabber
+> FrameGrabber_BASE;
+
+class FrameGrabber
+    : public FrameGrabber_BASE
 {
 public:
 
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 2127e87a93ec..d5bfc9c737ff 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -168,8 +168,6 @@ protected:
         return( g_atomic_int_get( &mnInitialized ) > 0 );
     }
 
-    static gpointer implThreadFunc( gpointer pData );
-
 private:
 
     Player( const Player& );