summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Ngo <nlminhtl@gmail.com>2013-07-16 08:35:11 +0300
committerMinh Ngo <nlminhtl@gmail.com>2013-07-16 08:35:11 +0300
commiteb86569610d00501df61ef82094172767168386a (patch)
treee5fa8e12e87b44d25964769c6b456dd2fa459bf8
parent9303e7460191bf2864c57a8882b64941a3484995 (diff)
Possibly binds a video frame into the WIN32 windowfeature/vlc
Change-Id: Ib45921e3162e7ce5f306c23b0b158a4c35102202
-rw-r--r--avmedia/source/vlc/vlcplayer.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index d54cb2cbcefe..376604dc9ef4 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 );