From 69ae23fdd1e39f4e7aa30082e36cc635d954bccf Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 25 Dec 2017 11:43:04 +0100
Subject: options: drop some previously deprecated options

A release has been made, so drop options deprecated for that release.
Also drop some options which have been deprecated a much longer time
before.

Also fix a typo in client-api-changes.rst.
---
 player/audio.c    |  3 ---
 player/command.c  | 44 --------------------------------------------
 player/core.h     |  7 -------
 player/loadfile.c |  7 +------
 4 files changed, 1 insertion(+), 60 deletions(-)

(limited to 'player')

diff --git a/player/audio.c b/player/audio.c
index 965ac8f71a..8422e109f1 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -140,9 +140,6 @@ static int recreate_audio_filters(struct MPContext *mpctx)
     if (afs->initialized < 1 && af_init(afs) < 0)
         goto fail;
 
-    if (mpctx->opts->softvol == SOFTVOL_NO)
-        MP_ERR(mpctx, "--softvol=no is not supported anymore.\n");
-
     mp_notify(mpctx, MPV_EVENT_AUDIO_RECONFIG, NULL);
 
     return 0;
diff --git a/player/command.c b/player/command.c
index 6288106bee..2d91c09435 100644
--- a/player/command.c
+++ b/player/command.c
@@ -2180,44 +2180,6 @@ static int property_switch_track(struct m_property *prop, int action, void *arg,
     return mp_property_generic_option(mpctx, prop, action, arg);
 }
 
-// Similar, less featured, for selecting by ff-index.
-static int property_switch_track_ff(void *ctx, struct m_property *prop,
-                                    int action, void *arg)
-{
-    MPContext *mpctx = ctx;
-    enum stream_type type = (intptr_t)prop->priv;
-    struct track *track = mpctx->current_track[0][type];
-
-    switch (action) {
-    case M_PROPERTY_GET:
-        *(int *) arg = track ? track->ff_index : -2;
-        return M_PROPERTY_OK;
-    case M_PROPERTY_SET: {
-        MP_WARN(mpctx, "Warning: property '%s' is deprecated and "
-                "will be removed in the future.\n", prop->name);
-        int id = *(int *)arg;
-        if (mpctx->playback_initialized) {
-            track = NULL;
-            for (int n = 0; n < mpctx->num_tracks; n++) {
-                struct track *cur = mpctx->tracks[n];
-                if (cur->type == type && cur->ff_index == id) {
-                    track = cur;
-                    break;
-                }
-            }
-            if (!track && id >= 0)
-                return M_PROPERTY_ERROR;
-            mp_switch_track_n(mpctx, 0, type, track, 0);
-            print_track_list(mpctx, "Track switched:");
-        } else {
-            mpctx->opts->stream_id_ff[type] = *(int *)arg;
-        }
-        return M_PROPERTY_OK;
-    }
-    }
-    return mp_property_generic_option(mpctx, prop, action, arg);
-}
-
 static int track_channels(struct track *track)
 {
     return track->stream ? track->stream->codec->channels.num : 0;
@@ -4051,12 +4013,6 @@ static const struct m_property mp_properties_base[] = {
 
     {"cursor-autohide", mp_property_cursor_autohide},
 
-#define TRACK_FF(name, type) \
-    {name, property_switch_track_ff, (void *)(intptr_t)type}
-    TRACK_FF("ff-vid", STREAM_VIDEO),
-    TRACK_FF("ff-aid", STREAM_AUDIO),
-    TRACK_FF("ff-sid", STREAM_SUB),
-
     {"window-minimized", mp_property_win_minimized},
     {"display-names", mp_property_display_names},
     {"display-fps", mp_property_display_fps},
diff --git a/player/core.h b/player/core.h
index 0b5f610737..4f4765d3e5 100644
--- a/player/core.h
+++ b/player/core.h
@@ -632,11 +632,4 @@ double calc_average_frame_duration(struct MPContext *mpctx);
 int init_video_decoder(struct MPContext *mpctx, struct track *track);
 void recreate_auto_filters(struct MPContext *mpctx);
 
-// Values of MPOpts.softvol
-enum {
-    SOFTVOL_NO = 0,
-    SOFTVOL_YES = 1,
-    SOFTVOL_AUTO = 2,
-};
-
 #endif /* MPLAYER_MP_CORE_H */
diff --git a/player/loadfile.c b/player/loadfile.c
index d2e26c1ba4..ca782f88d8 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -360,11 +360,8 @@ struct track *select_default_track(struct MPContext *mpctx, int order,
 {
     struct MPOpts *opts = mpctx->opts;
     int tid = opts->stream_id[order][type];
-    int ffid = order == 0 ? opts->stream_id_ff[type] : -1;
     char **langs = order == 0 ? opts->stream_lang[type] : NULL;
-    if (ffid != -1)
-        tid = -1; // prefer selecting ffid
-    if (tid == -2 || ffid == -2)
+    if (tid == -2)
         return NULL;
     bool select_fallback = type == STREAM_VIDEO || type == STREAM_AUDIO;
     struct track *pick = NULL;
@@ -374,8 +371,6 @@ struct track *select_default_track(struct MPContext *mpctx, int order,
             continue;
         if (track->user_tid == tid)
             return track;
-        if (track->ff_index == ffid)
-            return track;
         if (!pick || compare_track(track, pick, langs, mpctx->opts))
             pick = track;
     }
-- 
cgit v1.2.3