You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2011/08/29 01:22:13 UTC
svn commit: r1162607 - in
/incubator/ooo/trunk/main/avmedia/source/gstreamer: gstframegrabber.cxx
gstframegrabber.hxx gstplayer.hxx
Author: mst
Date: Sun Aug 28 23:22:13 2011
New Revision: 1162607
URL: http://svn.apache.org/viewvc?rev=1162607&view=rev
Log:
avmedia: fix gstreamer build breakage:
pass parameter pURI to base class ctor
(was caused by conflicting changes in solaris11 and impress210)
Modified:
incubator/ooo/trunk/main/avmedia/source/gstreamer/gstframegrabber.cxx
incubator/ooo/trunk/main/avmedia/source/gstreamer/gstframegrabber.hxx
incubator/ooo/trunk/main/avmedia/source/gstreamer/gstplayer.hxx
Modified: incubator/ooo/trunk/main/avmedia/source/gstreamer/gstframegrabber.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/avmedia/source/gstreamer/gstframegrabber.cxx?rev=1162607&r1=1162606&r2=1162607&view=diff
==============================================================================
--- incubator/ooo/trunk/main/avmedia/source/gstreamer/gstframegrabber.cxx (original)
+++ incubator/ooo/trunk/main/avmedia/source/gstreamer/gstframegrabber.cxx Sun Aug 28 23:22:13 2011
@@ -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 );
- }
}
// ------------------------------------------------------------------------------
Modified: incubator/ooo/trunk/main/avmedia/source/gstreamer/gstframegrabber.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/avmedia/source/gstreamer/gstframegrabber.hxx?rev=1162607&r1=1162606&r2=1162607&view=diff
==============================================================================
--- incubator/ooo/trunk/main/avmedia/source/gstreamer/gstframegrabber.hxx (original)
+++ incubator/ooo/trunk/main/avmedia/source/gstreamer/gstframegrabber.hxx Sun Aug 28 23:22:13 2011
@@ -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:
Modified: incubator/ooo/trunk/main/avmedia/source/gstreamer/gstplayer.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/avmedia/source/gstreamer/gstplayer.hxx?rev=1162607&r1=1162606&r2=1162607&view=diff
==============================================================================
--- incubator/ooo/trunk/main/avmedia/source/gstreamer/gstplayer.hxx (original)
+++ incubator/ooo/trunk/main/avmedia/source/gstreamer/gstplayer.hxx Sun Aug 28 23:22:13 2011
@@ -168,8 +168,6 @@ protected:
return( g_atomic_int_get( &mnInitialized ) > 0 );
}
- static gpointer implThreadFunc( gpointer pData );
-
private:
Player( const Player& );