[vlc-commits] [Git][videolan/npapi-vlc][master] 3 commits: Bump vlcpp submodule version

[Hugo Beauzée-Luyssen]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC Browser Plugins


Commits:
f772ac49 by Hugo Beauzée-Luyssen at 2019-05-31T15:33:58Z
Bump vlcpp submodule version

- - - - -
ae603761 by Hugo Beauzée-Luyssen at 2019-05-31T15:48:31Z
npapi: Disable marquee string getter

- - - - -
cab2b296 by Hugo Beauzée-Luyssen at 2019-05-31T15:50:52Z
activex: Disable marquee string getter

- - - - -


3 changed files:

- activex/vlccontrol2.cpp
- npapi/npruntime/npolibvlc.cpp
- vlcpp


Changes:

=====================================
activex/vlccontrol2.cpp
=====================================
@@ -888,10 +888,14 @@ STDMETHODIMP VLCMarquee::get_text(BSTR *val)
     if( NULL == val )
         return E_POINTER;
 
+#if LIBVLC_VERSION_INT < LIBVLC_VERSION(4, 0, 0, 0)
     auto str = _plug->get_player().get_mp().marqueeString( libvlc_marquee_Text );
     if( !str.empty() )
         *val = BSTRFromCStr( CP_UTF8, str.c_str() );
     return S_OK;
+#else
+    return E_INVALIDARG;
+#endif
 }
 
 STDMETHODIMP VLCMarquee::put_text(BSTR val)


=====================================
npapi/npruntime/npolibvlc.cpp
=====================================
@@ -1694,9 +1694,11 @@ LibvlcMarqueeNPObject::getProperty(int index, npapi::OutVariant& result)
         result = position_bynumber( mp.marqueeInt( libvlc_marquee_Position ) );
         return INVOKERESULT_NO_ERROR;
 
+#if LIBVLC_VERSION_INT < LIBVLC_VERSION(4, 0, 0, 0)
     case ID_marquee_text:
         result = mp.marqueeString( libvlc_marquee_Text );
         return INVOKERESULT_NO_ERROR;
+#endif
     }
     return INVOKERESULT_GENERIC_ERROR;
 }


=====================================
vlcpp
=====================================
@@ -1 +1 @@
-Subproject commit 5147d358c5918bdf1ebb96d1292b3b7ac2c800f9
+Subproject commit 4955846df7abad685c72b2202e2c445dc42feb11



View it on GitLab: https://code.videolan.org/videolan/npapi-vlc/compare/4eafcb16f4513d5cf10d0c5bc4c388a0bfa7d91c...cab2b2961b4cf5c9139aaec39358a3f10ac33dda

-- 
View it on GitLab: https://code.videolan.org/videolan/npapi-vlc/compare/4eafcb16f4513d5cf10d0c5bc4c388a0bfa7d91c...cab2b2961b4cf5c9139aaec39358a3f10ac33dda
You're receiving this email because of your account on code.videolan.org.