[vlc-devel] [PATCH 07/13] player: remove vlc_player_vout_SetFilter

[Thomas Guillem]

It must be replaced with legacy vout variables handling.
---
 include/vlc_player.h | 42 ------------------------------------------
 src/input/player.c   | 33 ---------------------------------
 src/libvlccore.sym   |  2 --
 3 files changed, 77 deletions(-)

diff --git a/include/vlc_player.h b/include/vlc_player.h
index bc93f6029d..df96854685 100644
--- a/include/vlc_player.h
+++ b/include/vlc_player.h
@@ -323,20 +323,6 @@ enum vlc_player_subtitle_sync
     VLC_PLAYER_SUBTITLE_SYNC_APPLY,
 };
 
-/**
- * Vout filter type
- *
- * @warning Temporary enum, waiting for a refined vout filter API
- *
- * @see vlc_player_vout_SetFilter()
- */
-enum vlc_vout_filter_type
-{
-    VLC_VOUT_FILTER_VIDEO_FILTER,
-    VLC_VOUT_FILTER_SUB_SOURCE,
-    VLC_VOUT_FILTER_SUB_FILTER,
-};
-
 /** Player capability: can seek */
 #define VLC_PLAYER_CAP_SEEK (1<<0)
 /** Player capability: can pause */
@@ -2752,34 +2738,6 @@ vlc_player_vout_ToggleWallpaperMode(vlc_player_t *player)
         !vlc_player_vout_IsWallpaperModeEnabled(player));
 }
 
-/**
- * Set a filter chain to all vouts and all future vouts
- *
- * @warning This is a temporary function, waiting for a refined vout filter
- * API.
- *
- * @param player instance
- * @param type filter type
- * @param value a valid chain of filter (separated with ',') or NULL
- */
-VLC_API void
-vlc_player_vout_SetFilter(vlc_player_t *player, enum vlc_vout_filter_type type,
-                          const char *value);
-
-/**
- * Get the filter chain value applied to all vouts
- *
- * @warning This is a temporary function, waiting for a refined vout filter
- * API.
- *
- * @param player instance
- * @param type filter type
- * @return an allocated string representing the filter chain, free it with
- * free(), can be NULL
- */
-VLC_API char *
-vlc_player_vout_GetFilter(vlc_player_t *player, enum vlc_vout_filter_type type);
-
 /**
  * Take a snapshot on all vouts
  *
diff --git a/src/input/player.c b/src/input/player.c
index 316dc02a2b..da4be4c2b0 100644
--- a/src/input/player.c
+++ b/src/input/player.c
@@ -3375,39 +3375,6 @@ vlc_player_vout_SetWallpaperModeEnabled(vlc_player_t *player, bool enabled)
     vlc_player_vout_SendEvent(player, on_wallpaper_mode_changed, NULL, enabled);
 }
 
-static const char *
-vlc_vout_filter_type_to_varname(enum vlc_vout_filter_type type)
-{
-    switch (type)
-    {
-        case VLC_VOUT_FILTER_VIDEO_FILTER:
-            return "video-filter";
-        case VLC_VOUT_FILTER_SUB_SOURCE:
-            return "sub-source";
-        case VLC_VOUT_FILTER_SUB_FILTER:
-            return "sub-filter";
-        default:
-            vlc_assert_unreachable();
-    }
-}
-
-void
-vlc_player_vout_SetFilter(vlc_player_t *player, enum vlc_vout_filter_type type,
-                          const char *value)
-{
-    const char *varname = vlc_vout_filter_type_to_varname(type);
-    if (varname)
-        vlc_player_vout_SetVar(player, varname, VLC_VAR_STRING,
-                               (vlc_value_t) { .psz_string = (char *) value });
-}
-
-char *
-vlc_player_vout_GetFilter(vlc_player_t *player, enum vlc_vout_filter_type type)
-{
-    const char *varname = vlc_vout_filter_type_to_varname(type);
-    return varname ? var_GetString(player, varname) : NULL;
-}
-
 void
 vlc_player_vout_Snapshot(vlc_player_t *player)
 {
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 0270f967f1..bb7f3ffd86 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -923,14 +923,12 @@ vlc_player_Unlock
 vlc_player_UnselectTrack
 vlc_player_UpdateViewpoint
 vlc_player_vout_AddListener
-vlc_player_vout_GetFilter
 vlc_player_vout_Hold
 vlc_player_vout_HoldAll
 vlc_player_vout_IsFullscreen
 vlc_player_vout_IsWallpaperModeEnabled
 vlc_player_vout_OSDMessage
 vlc_player_vout_RemoveListener
-vlc_player_vout_SetFilter
 vlc_player_vout_SetFullscreen
 vlc_player_vout_SetWallpaperModeEnabled
 vlc_player_vout_Snapshot
-- 
2.20.1