[vlc-commits] Use new media api

[Thomas Guillem]

npapi-vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Jul 29 11:31:54 2022 +0200| [82ae7804e120c8bbeb249eafa0220e80f21df709] | committer: Thomas Guillem

Use new media api

> https://code.videolan.org/videolan/npapi-vlc/commit/82ae7804e120c8bbeb249eafa0220e80f21df709
---

 activex/vlccontrol2.cpp | 20 ++++++++++----------
 common/vlc_player.cpp   |  6 +++---
 vlcpp                   |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/activex/vlccontrol2.cpp b/activex/vlccontrol2.cpp
index e8d3a27..0d770fd 100644
--- a/activex/vlccontrol2.cpp
+++ b/activex/vlccontrol2.cpp
@@ -454,7 +454,7 @@ STDMETHODIMP VLCAudio::get_track(long* track)
 
 STDMETHODIMP VLCAudio::put_track(long track)
 {
-    auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Audio );
+    auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Audio, false );
     if ( track >= tracks.size() )
         return E_INVALIDARG;
     _plug->get_player().get_mp().selectTrack( tracks[track] );
@@ -473,7 +473,7 @@ STDMETHODIMP VLCAudio::get_count(long* trackNumber)
     case libvlc_Playing:
     case libvlc_Paused:
     {
-        *trackNumber = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Audio ).size();
+        *trackNumber = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Audio, false ).size();
         break;
     }
     default:
@@ -506,7 +506,7 @@ STDMETHODIMP VLCAudio::description(long trackId, BSTR* name)
     case libvlc_Playing:
     case libvlc_Paused:
     {
-        auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Audio );
+        auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Audio, false );
         if ( trackId >= tracks.size() )
             return E_INVALIDARG;
         *name = BSTRFromCStr( CP_UTF8, tracks[trackId].name().c_str() );
@@ -1146,7 +1146,7 @@ STDMETHODIMP VLCSubtitle::get_track(long* spu)
 //FIXME: this should be unsigned
 STDMETHODIMP VLCSubtitle::put_track(long spu)
 {
-    auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Subtitle );
+    auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Subtitle, false );
     if ( spu >= tracks.size() )
         return E_INVALIDARG;
     _plug->get_player().get_mp().selectTrack( tracks[spu] );
@@ -1165,7 +1165,7 @@ STDMETHODIMP VLCSubtitle::get_count(long* spuNumber)
     case libvlc_Playing:
     case libvlc_Paused:
     {
-        *spuNumber = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Subtitle ).size();
+        *spuNumber = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Subtitle, false ).size();
         break;
     }
     default:
@@ -1199,7 +1199,7 @@ STDMETHODIMP VLCSubtitle::description(long nameID, BSTR* name)
     case libvlc_Playing:
     case libvlc_Paused:
     {
-        auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Subtitle );
+        auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Subtitle, false );
         if ( nameID >= tracks.size() )
             return E_INVALIDARG;
         *name = BSTRFromCStr( CP_UTF8, tracks[nameID].name().c_str() );
@@ -1362,7 +1362,7 @@ STDMETHODIMP VLCVideo::get_subtitle(long* spu)
 
 STDMETHODIMP VLCVideo::put_subtitle(long spu)
 {
-    auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Subtitle );
+    auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Subtitle, false );
     if ( spu >= tracks.size() )
         return E_INVALIDARG;
     _plug->get_player().get_mp().selectTrack( tracks[spu] );
@@ -1520,7 +1520,7 @@ STDMETHODIMP VLCVideo::get_track(long* track)
 
 STDMETHODIMP VLCVideo::put_track(long track)
 {
-    auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Video );
+    auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Video, false );
     if ( track >= tracks.size() )
         return E_INVALIDARG;
     _plug->get_player().get_mp().selectTrack( tracks[track] );
@@ -1539,7 +1539,7 @@ STDMETHODIMP VLCVideo::get_count(long* trackNumber)
     case libvlc_Playing:
     case libvlc_Paused:
     {
-        *trackNumber = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Video ).size();
+        *trackNumber = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Video, false ).size();
         break;
     }
     default:
@@ -1574,7 +1574,7 @@ STDMETHODIMP VLCVideo::description(long trackId, BSTR* name)
     case libvlc_Playing:
     case libvlc_Paused:
     {
-        auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Video );
+        auto tracks = _plug->get_player().get_mp().tracks( VLC::MediaTrack::Type::Video, false );
         if ( trackId >= tracks.size() )
             return E_INVALIDARG;
         *name = BSTRFromCStr( CP_UTF8, tracks[trackId].name().c_str() );
diff --git a/common/vlc_player.cpp b/common/vlc_player.cpp
index 77c84e6..251948d 100644
--- a/common/vlc_player.cpp
+++ b/common/vlc_player.cpp
@@ -173,19 +173,19 @@ void vlc_player::play()
 
 int vlc_player::currentAudioTrack()
 {
-    auto tracks = _mp.tracks( VLC::MediaTrack::Type::Audio );
+    auto tracks = _mp.tracks( VLC::MediaTrack::Type::Audio, true );
     return getCurrentTrack( tracks );
 }
 
 int vlc_player::currentSubtitleTrack()
 {
-    auto tracks = _mp.tracks( VLC::MediaTrack::Type::Subtitle );
+    auto tracks = _mp.tracks( VLC::MediaTrack::Type::Subtitle, true );
     return getCurrentTrack( tracks );
 }
 
 int vlc_player::currentVideoTrack()
 {
-    auto tracks = _mp.tracks( VLC::MediaTrack::Type::Video );
+    auto tracks = _mp.tracks( VLC::MediaTrack::Type::Video, true );
     return getCurrentTrack( tracks );
 }
 
diff --git a/vlcpp b/vlcpp
index 0c7d396..d077d7e 160000
--- a/vlcpp
+++ b/vlcpp
@@ -1 +1 @@
-Subproject commit 0c7d3968010f1b27b36e78c11e07e4d7f6fe756b
+Subproject commit d077d7e9ac3810b4adda123e1d8156bbcd3793b5