avmedia/source/vlc/vlcplayer.cxx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit eb86569610d00501df61ef82094172767168386a
Author: Minh Ngo <nlmin...@gmail.com>
Date: Tue Jul 16 08:35:11 2013 +0300
Possibly binds a video frame into the WIN32 window
Change-Id: Ib45921e3162e7ce5f306c23b0b158a4c35102202
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index d54cb2c..376604d 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -36,8 +36,8 @@ namespace
VLCPlayer::VLCPlayer( const rtl::OUString& url )
: VLC_Base(m_aMutex)
, mInstance( libvlc_new( sizeof( VLC_ARGS ) / sizeof( VLC_ARGS[0] ),
VLC_ARGS ), libvlc_release )
- , mPlayer( libvlc_media_player_new(mInstance.get()),
libvlc_media_player_release )
- , mMedia( InitMedia( url, mInstance), libvlc_media_release )
+ , mPlayer( libvlc_media_player_new( mInstance.get() ),
libvlc_media_player_release )
+ , mMedia( InitMedia( url, mInstance ), libvlc_media_release )
{
libvlc_media_player_set_media( mPlayer.get(), mMedia.get() );
}
@@ -165,7 +165,11 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL
VLCPlayer::createPlayerWind
if (winID != -1)
{
+#if defined(WIN32) && !defined(UNIX)
+ libvlc_media_player_set_hwnd( mPlayer.get(), winID );
+#else
libvlc_media_player_set_xwindow( mPlayer.get(), winID );
+#endif
}
return uno::Reference< css::media::XPlayerWindow >( window );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
