npapi-vlc | branch: master | Daniel Amm <[email protected]> | Sat Jul 25 12:24:23 2015 +0200| [908d5fd336c8bb475b7b06be8306917aed992b94] | committer: Jean-Baptiste Kempf
activex: move adding of initial playlist item (fixes #14563) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=908d5fd336c8bb475b7b06be8306917aed992b94 --- activex/plugin.cpp | 99 +++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 52 deletions(-) diff --git a/activex/plugin.cpp b/activex/plugin.cpp index e46edcb..9d59da2 100644 --- a/activex/plugin.cpp +++ b/activex/plugin.cpp @@ -455,57 +455,9 @@ void VLCPlugin::initVLC() return; } - get_player().mlp().setPlaybackMode( _b_autoloop ? libvlc_playback_mode_loop : - libvlc_playback_mode_default ); - // register player events player_register_events(); - // initial playlist item - if( SysStringLen(_bstr_mrl) > 0 ) - { - char *psz_mrl = NULL; - - if( SysStringLen(_bstr_baseurl) > 0 ) - { - /* - ** if the MRL a relative URL, we should end up with an absolute URL - */ - LPWSTR abs_url = CombineURL(_bstr_baseurl, _bstr_mrl); - if( NULL != abs_url ) - { - psz_mrl = CStrFromWSTR(CP_UTF8, abs_url, wcslen(abs_url)); - CoTaskMemFree(abs_url); - } - else - { - psz_mrl = CStrFromBSTR(CP_UTF8, _bstr_mrl); - } - } - else - { - /* - ** baseURL is empty, assume MRL is absolute - */ - psz_mrl = CStrFromBSTR(CP_UTF8, _bstr_mrl); - } - if( NULL != psz_mrl ) - { - const char *options[1]; - int i_options = 0; - - char timeBuffer[32]; - if( _i_time ) - { - snprintf(timeBuffer, sizeof(timeBuffer), ":start-time=%d", _i_time); - options[i_options++] = timeBuffer; - } - // add default target to playlist - m_player.add_item( psz_mrl, i_options, options); - CoTaskMemFree(psz_mrl); - } - } - if( !isInPlaceActive() ) { LPOLECLIENTSITE pClientSite; @@ -664,12 +616,55 @@ HRESULT VLCPlugin::onActivateInPlace(LPMSG, HWND hwndParent, LPCRECT lprcPosRect HRGN clipRgn = CreateRectRgnIndirect(&clipRect); SetWindowRgn(_inplacewnd, clipRgn, TRUE); - if( isUserMode() ) { + if( isUserMode() ) + { _WindowsManager.CreateWindows(this->getInPlaceWindow()); - } - if( _b_usermode ) - { + // initial playlist item + if( SysStringLen(_bstr_mrl) > 0 ) + { + char *psz_mrl = NULL; + + if( SysStringLen(_bstr_baseurl) > 0 ) + { + /* + ** if the MRL a relative URL, we should end up with an absolute URL + */ + LPWSTR abs_url = CombineURL(_bstr_baseurl, _bstr_mrl); + if( NULL != abs_url ) + { + psz_mrl = CStrFromWSTR(CP_UTF8, abs_url, wcslen(abs_url)); + CoTaskMemFree(abs_url); + } + else + { + psz_mrl = CStrFromBSTR(CP_UTF8, _bstr_mrl); + } + } + else + { + /* + ** baseURL is empty, assume MRL is absolute + */ + psz_mrl = CStrFromBSTR(CP_UTF8, _bstr_mrl); + } + if( NULL != psz_mrl ) + { + const char *options[1]; + int i_options = 0; + + char timeBuffer[32]; + if( _i_time ) + { + snprintf(timeBuffer, sizeof(timeBuffer), ":start-time=%d", _i_time); + options[i_options++] = timeBuffer; + } + // add default target to playlist + m_player.add_item( psz_mrl, i_options, options); + CoTaskMemFree(psz_mrl); + } + } + if( get_autoplay() ) { get_player().play(); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
