[Libreoffice-commits] .: Branch 'integration/dev300_m101' - avmedia/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Mar 13 17:57:33 PDT 2011
avmedia/source/viewer/mediawindow_impl.cxx | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 412a60325c547f4aaf05635c169ed4428102642c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 13 19:53:21 2011 -0500
fix issue with avmedia GSTREAMER on mac
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 8d7bed5..48cd33b 100755
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -238,14 +238,11 @@ void MediaWindowImpl::onURLChanged()
aArgs[ 0 ] = uno::makeAny( nWndHandle );
aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) );
- const SystemEnvData *pSystemData = maChildWindow.GetSystemData();
- OSL_TRACE( "MediaWindowImpl::onURLChanged xwindow id: %ld", pSystemData->aWindow );
- aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow );
-
+ aArgs[ 2 ] = uno::makeAny( reinterpret_cast< sal_IntPtr >( &maChildWindow ) );
+
try
{
- if( pSystemData->aWindow != 0 )
- xPlayerWindow = getPlayer()->createPlayerWindow( aArgs );
+ xPlayerWindow = getPlayer()->createPlayerWindow( aArgs );
}
catch( uno::RuntimeException )
{
More information about the Libreoffice-commits
mailing list