MediaPlayer: adapt with recent LibVLC changes

tguillem · tguillem · commit 0116906d78ef · 2022-12-13T11:44:32.000+01:00
Replace libvlc_audio_XXX_channel with libvlc_audio_XXX_stereomode

The values come from an enum and are mostly compatible with older values.

Add mixMode/setMixMode functions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 variables:
   VLC30_IMAGE: registry.videolan.org/medialibrary:20201009131431
-  VLC40_IMAGE: registry.videolan.org/libvlcpp-unstable:20220727093032
+  VLC40_IMAGE: registry.videolan.org/libvlcpp-unstable:20221213095400
 
 .common_build:
   rules:
diff --git a/vlcpp/MediaPlayer.hpp b/vlcpp/MediaPlayer.hpp
@@ -1032,7 +1032,6 @@ class MediaPlayer : private CallbackOwner<13>, public Internal<libvlc_media_play
     {
         return libvlc_audio_set_track(*this, i_track) == 0;
     }
-#endif
 
     /**
      * Get current audio channel.
@@ -1057,6 +1056,47 @@ class MediaPlayer : private CallbackOwner<13>, public Internal<libvlc_media_play
     {
         return libvlc_audio_set_channel(*this, channel) == 0;
     }
+#else // libvlc 4.0
+    /**
+     * Get current audio stereo mode.
+     *
+     * \return the audio stereo mode
+     */
+    libvlc_audio_output_stereomode_t stereoMode()
+    {
+        return libvlc_audio_get_stereomode(*this);
+    }
+
+    /**
+     * Set current audio stereo mode.
+     *
+     * \param mode the audio stereo mode
+     */
+    bool setStereoMode(libvlc_audio_output_stereomode_t mode)
+    {
+        return libvlc_audio_set_stereomode(*this, mode) == 0;
+    }
+
+    /**
+     * Get current audio mix mode.
+     *
+     * \return the audio mix mode
+     */
+    libvlc_audio_output_mixmode_t mixMode()
+    {
+        return libvlc_audio_get_mixmode(*this);
+    }
+
+    /**
+     * Set current audio mix mode.
+     *
+     * \param mode the audio mix mode
+     */
+    bool setMixMode(libvlc_audio_output_mixmode_t mode)
+    {
+        return libvlc_audio_set_mixmode(*this, mode) == 0;
+    }
+#endif // libvlc 4.0
 
     /**
      * Get current audio delay.
