From 889d63612701941b73feba6d9939f2bee37ff605 Mon Sep 17 00:00:00 2001 From: Damien Fouilleul Date: Tue, 15 Nov 2005 14:52:19 +0000 Subject: [PATCH] backported changes in revision 13253 --- activex/plugin.cpp | 2 +- src/libvlc.c | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/activex/plugin.cpp b/activex/plugin.cpp index 9cf355dce8..714c851bb8 100644 --- a/activex/plugin.cpp +++ b/activex/plugin.cpp @@ -569,7 +569,7 @@ HRESULT VLCPlugin::onLoad(void) if( NULL != abs_url ) { if( SUCCEEDED(UrlCombineW(base_url, _bstr_mrl, abs_url, &len, - URL_ESCAPE_UNSAFE)) ) + URL_ESCAPE_UNSAFE|URL_PLUGGABLE_PROTOCOL)) ) { SysFreeString(_bstr_mrl); _bstr_mrl = SysAllocStringLen(abs_url, len); diff --git a/src/libvlc.c b/src/libvlc.c index 6a3b19fbd2..67aad42026 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -1308,11 +1308,11 @@ int VLC_Stop( int i_object ) /***************************************************************************** * VLC_IsPlaying: Query for Playlist Status *****************************************************************************/ + vlc_bool_t VLC_IsPlaying( int i_object ) { playlist_t * p_playlist; vlc_bool_t b_playing; - vlc_value_t val; vlc_t *p_vlc = vlc_current_object( i_object ); @@ -1329,14 +1329,17 @@ vlc_bool_t VLC_IsPlaying( int i_object ) if( i_object ) vlc_object_release( p_vlc ); return VLC_ENOOBJ; } - if( !p_playlist->p_input ) + + if( p_playlist->p_input ) { - if( i_object ) vlc_object_release( p_vlc ); - vlc_object_release( p_playlist ); - return VLC_ENOOBJ; + vlc_value_t val; + var_Get( p_playlist->p_input, "state", &val ); + b_playing = ( val.i_int == PLAYING_S ); + } + else + { + b_playing = playlist_IsPlaying( p_playlist ); } - var_Get( p_playlist->p_input, "state", &val ); - b_playing = ( val.i_int == PLAYING_S ); vlc_object_release( p_playlist ); if( i_object ) vlc_object_release( p_vlc ); -- 2.39.2