diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-04-01 12:00:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-04-01 12:00:12 +0100 |
| commit | 745469225d7d19e9d9567e85c92d1c90172cb529 (patch) | |
| tree | 1738d7449e2f424caf12bb40aeb398ba88327d9b /slideshow | |
| parent | 1e1a14ba901b1834e175945ebf0a8efce6131134 (diff) | |
fix catastrophic merge to restore video playback
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index f46ac03cab23..61937a9ea791 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() ) ); |