[vlc-commits] player: remove vlc_player_SetVideoSplitter

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Apr 15 15:20:06 2019 +0200| [2ef9ac34cfd7e0552a40d8ce0cae840ef0cacbec] | committer: Thomas Guillem

player: remove vlc_player_SetVideoSplitter

It must be replaced with legacy vout variables handling.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2ef9ac34cfd7e0552a40d8ce0cae840ef0cacbec
---

 include/vlc_player.h |  9 ---------
 src/input/player.c   | 26 --------------------------
 src/libvlccore.sym   |  1 -
 3 files changed, 36 deletions(-)

diff --git a/include/vlc_player.h b/include/vlc_player.h
index 14a7dcdc21..897626a383 100644
--- a/include/vlc_player.h
+++ b/include/vlc_player.h
@@ -2461,15 +2461,6 @@ VLC_API vlc_object_t *
 vlc_player_GetV4l2Object(vlc_player_t *player) VLC_DEPRECATED;
 
 /**
- * Set a video splitter to the main vout
- *
- * @param player locked instance
- * @param splitter a video splitter name or NULL
- */
-VLC_API void
-vlc_player_SetVideoSplitter(vlc_player_t *player, const char *splitter);
-
-/**
  * Get the audio output
  *
  * @warning The returned pointer must be released with aout_Release().
diff --git a/src/input/player.c b/src/input/player.c
index 6d7f0db036..dd17406ffe 100644
--- a/src/input/player.c
+++ b/src/input/player.c
@@ -3339,30 +3339,6 @@ vlc_player_GetV4l2Object(vlc_player_t *player)
 }
 
 void
-vlc_player_SetVideoSplitter(vlc_player_t *player, const char *splitter)
-{
-    if (config_GetType("video-splitter") == 0)
-        return;
-    struct vlc_player_input *input = vlc_player_get_input_locked(player);
-    if (!input)
-        return;
-
-    vout_thread_t *vout = vlc_player_vout_Hold(player);
-    var_SetString(vout, "video-splitter", splitter);
-    vout_Release(vout);
-
-    /* FIXME vout cannot handle live video splitter change, restart the main
-     * vout manually by restarting the first video es */
-    struct vlc_player_track *track;
-    vlc_vector_foreach(track, &input->video_track_vector)
-        if (track->selected)
-        {
-            vlc_player_RestartTrack(player, track->es_id);
-            break;
-        }
-}
-
-void
 vlc_player_vout_SetFullscreen(vlc_player_t *player, bool enabled)
 {
     vlc_player_vout_SetVar(player, "fullscreen", VLC_VAR_BOOL,
@@ -3497,8 +3473,6 @@ vlc_player_New(vlc_object_t *parent,
     VAR_CREATE("demux-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
 
     /* vout variables */
-    if (config_GetType("video-splitter"))
-        VAR_CREATE("video-splitter", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
     VAR_CREATE("fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
     VAR_CREATE("video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
     VAR_CREATE("video-wallpaper", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 51b70d2209..fd4171d76f 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -911,7 +911,6 @@ vlc_player_SetSubtitleTextScale
 vlc_player_SetTeletextEnabled
 vlc_player_SetTeletextTransparency
 vlc_player_SetTrackCategoryEnabled
-vlc_player_SetVideoSplitter
 vlc_player_Start
 vlc_player_Stop
 vlc_player_title_list_GetAt