diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-04-01 12:06:05 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-04-01 12:06:05 +0100 |
commit | c12dc352b56e5285eb1f3154c53b45d92736c622 (patch) | |
tree | 1aa45c2fd2ee12571b983029f78e0b0a7e7e2331 /avmedia | |
parent | fix video, implementation name was wrong (diff) | |
download | core-c12dc352b56e5285eb1f3154c53b45d92736c622.tar.gz core-c12dc352b56e5285eb1f3154c53b45d92736c622.zip |
fix up post-merge to actually work again
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 18 | ||||
-rwxr-xr-x | avmedia/source/gstreamer/makefile.mk | 2 |
2 files changed, 14 insertions, 6 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 227f1eca8c0c..042f124952ae 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -28,9 +28,11 @@ #include <math.h> -#ifndef __RTL_USTRING_ #include <rtl/string.hxx> -#endif + +#include <vcl/syschild.hxx> +#include <vcl/sysdata.hxx> + #include "gstplayer.hxx" #include "gstframegrabber.hxx" @@ -573,9 +575,15 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co xRet = pWindow; - if( rArguments.getLength() > 2 ) { - rArguments[ 2 ] >>= mnWindowID; - DBG( "window ID: %ld", mnWindowID ); + if( rArguments.getLength() > 2 ) + { + sal_IntPtr pIntPtr = 0; + rArguments[ 2 ] >>= pIntPtr; + SystemChildWindow *pParentWindow = reinterpret_cast< SystemChildWindow* >( pIntPtr ); + const SystemEnvData* pEnvData = pParentWindow ? pParentWindow->GetSystemData() : NULL; + OSL_ASSERT(pEnvData); + if (pEnvData) + mnWindowID = pEnvData->aWindow; } } diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk index 692a63abe743..0bea1330a099 100755 --- a/avmedia/source/gstreamer/makefile.mk +++ b/avmedia/source/gstreamer/makefile.mk @@ -62,7 +62,7 @@ EXCEPTIONSFILES= \ $(SLO)$/gstuno.obj \ SHL1TARGET=$(TARGET) -SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(PKGCONFIG_LIBS) $(TOOLSLIB) +SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(PKGCONFIG_LIBS) $(TOOLSLIB) $(VCLLIB) SHL1IMPLIB=i$(TARGET) SHL1LIBS=$(SLB)$/$(TARGET).lib SHL1DEF=$(MISC)$/$(SHL1TARGET).def |