Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC Browser Plugins
Commits: c51e378f by Hugo Beauzée-Luyssen at 2018-05-09T20:48:26-07:00 Bump libvlcpp version - - - - - d64081f6 by Hugo Beauzée-Luyssen at 2018-05-09T20:48:26-07:00 Update deinterlace functions to recent API changes - - - - - 3 changed files: - activex/vlccontrol2.cpp - npapi/npruntime/npolibvlc.cpp - vlcpp Changes: ===================================== activex/vlccontrol2.cpp ===================================== --- a/activex/vlccontrol2.cpp +++ b/activex/vlccontrol2.cpp @@ -562,7 +562,12 @@ STDMETHODIMP VLCAudio::toggleMute() STDMETHODIMP VLCDeinterlace::disable() { +#if LIBVLC_VERSION_INT >= LIBVLC_VERSION(4, 0, 0, 0) + _plug->get_player().get_mp().setDeinterlace( VLC::MediaPlayer::DeinterlaceState::Disabled, + std::string() ); +#else _plug->get_player().get_mp().setDeinterlace( "" ); +#endif return S_OK; } @@ -571,7 +576,12 @@ STDMETHODIMP VLCDeinterlace::enable(BSTR mode) char *psz_mode = CStrFromBSTR(CP_UTF8, mode); if ( psz_mode == nullptr ) return E_OUTOFMEMORY; +#if LIBVLC_VERSION_INT >= LIBVLC_VERSION(4, 0, 0, 0) + _plug->get_player().get_mp().setDeinterlace( VLC::MediaPlayer::DeinterlaceState::Enabled, + psz_mode ); +#else _plug->get_player().get_mp().setDeinterlace( psz_mode ); +#endif CoTaskMemFree(psz_mode); return S_OK; } ===================================== npapi/npruntime/npolibvlc.cpp ===================================== --- a/npapi/npruntime/npolibvlc.cpp +++ b/npapi/npruntime/npolibvlc.cpp @@ -1981,7 +1981,12 @@ LibvlcDeinterlaceNPObject::invoke(int index, const NPVariant *args, switch( index ) { case ID_deint_disable: +#if LIBVLC_VERSION_INT >= LIBVLC_VERSION(4, 0, 0, 0) + mp.setDeinterlace( VLC::MediaPlayer::DeinterlaceState::Disabled, + std::string() ); +#else mp.setDeinterlace( std::string() ); +#endif break; case ID_deint_enable: @@ -1992,7 +1997,11 @@ LibvlcDeinterlaceNPObject::invoke(int index, const NPVariant *args, if ( !v.is<const char*>() ) return INVOKERESULT_INVALID_VALUE; +#if LIBVLC_VERSION_INT >= LIBVLC_VERSION(4, 0, 0, 0) + mp.setDeinterlace( VLC::MediaPlayer::DeinterlaceState::Enabled, v ); +#else mp.setDeinterlace( v ); +#endif break; } default: ===================================== vlcpp ===================================== --- a/vlcpp +++ b/vlcpp @@ -1 +1 @@ -Subproject commit 3088cfe51bbfda2c2ada51107aabf930938f9910 +Subproject commit 28e2c7a668e740471c80eb3e7d66162aeffee4cf View it on GitLab: https://code.videolan.org/videolan/npapi-vlc/compare/4cde6f00728526999b67786e5f8fb2e57fda2298...d64081f678a467a95fc0641f6967281a7098da36 --- View it on GitLab: https://code.videolan.org/videolan/npapi-vlc/compare/4cde6f00728526999b67786e5f8fb2e57fda2298...d64081f678a467a95fc0641f6967281a7098da36 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits