[Libreoffice-commits] .: slideshow/source

[Caolán McNamara]

 slideshow/source/engine/shapes/viewmediashape.cxx |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 553b1d5a3d58f43d631d16f3a87db38f5bb2a68f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 1 12:00:12 2011 +0100

    fix catastrophic merge to restore video playback

diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 2e5e716..00d2045 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -42,9 +42,6 @@
 #include <vcl/window.hxx>
 #include <vcl/syschild.hxx>
 #include <vcl/salbtype.hxx>
-#ifdef GSTREAMER
-#include <vcl/sysdata.hxx>
-#endif
 
 #include <basegfx/tools/canvastools.hxx>
 #include <basegfx/numeric/ftools.hxx>
@@ -457,19 +454,11 @@ namespace slideshow
                             
                             if( mxPlayer.is() )
                             {
-#ifndef GSTREAMER
                                 aArgs[ 0 ] = uno::makeAny( 
                                     sal::static_int_cast< sal_IntPtr >( mpMediaWindow->GetParentWindowHandle() ) );
-#else
-                                                                aArgs[ 0 ] = uno::makeAny ( (sal_Int32) 0 );
-#endif
+
                                 aAWTRect.X = aAWTRect.Y = 0;
                                 aArgs[ 1 ] = uno::makeAny( aAWTRect );
-#ifdef GSTREAMER
-                                                                const SystemEnvData *pSystemData = mpMediaWindow->GetSystemData();
-                                                                OSL_TRACE( "xwindow id: %ld", pSystemData->aWindow );
-                                aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow );
-#endif
 
                                 aArgs[ 2 ] = uno::makeAny( reinterpret_cast< sal_IntPtr >( mpMediaWindow.get() ) );