From 950999dd7bcf863535634e2ac227d19979beadd4 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 15 Sep 2012 01:48:27 +0200
Subject: commands: remove speed_set/speed_incr commands

Redundant with set/switch commands.
---
 command.c      | 17 ++---------------
 etc/input.conf |  2 +-
 input/input.c  |  4 ++--
 input/input.h  |  2 --
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/command.c b/command.c
index dcf7634ead..961a74ee7c 100644
--- a/command.c
+++ b/command.c
@@ -2097,7 +2097,6 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
     sh_video_t *const sh_video = mpctx->sh_video;
     int osd_duration = opts->osd_duration;
     int osdl = cmd->on_osd ? 1 : OSD_LEVEL_INVISIBLE;
-    int case_fallthrough_hack = 0;
     switch (cmd->id) {
     case MP_CMD_SEEK: {
         float v = cmd->args[0].v.f;
@@ -2238,21 +2237,9 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
         video_reset_aspect(sh_video);
         break;
 
-    case MP_CMD_SPEED_INCR: {
+    case MP_CMD_SPEED_MULT: {
         float v = cmd->args[0].v.f;
-        mp_property_do("speed", M_PROPERTY_STEP_UP, &v, mpctx);
-        if (cmd->on_osd)
-            show_property_osd(mpctx, "speed");
-        break;
-    }
-
-    case MP_CMD_SPEED_MULT:
-        case_fallthrough_hack = true;
-
-    case MP_CMD_SPEED_SET: {
-        float v = cmd->args[0].v.f;
-        if (case_fallthrough_hack)
-            v *= mpctx->opts.playback_speed;
+        v *= mpctx->opts.playback_speed;
         mp_property_do("speed", M_PROPERTY_SET, &v, mpctx);
         if (cmd->on_osd)
             show_property_osd(mpctx, "speed");
diff --git a/etc/input.conf b/etc/input.conf
index 8c23bcde96..e7acb77905 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -51,7 +51,7 @@ PGDWN seek -600
 ] speed_mult 1.1
 { speed_mult 0.5
 } speed_mult 2.0
-BS speed_set 1.0                        # reset speed to normal
+BS set speed 1.0                        # reset speed to normal
 q quit
 q {encode} quit
 ESC quit
diff --git a/input/input.c b/input/input.c
index 7d751ea1bf..a4575d8f37 100644
--- a/input/input.c
+++ b/input/input.c
@@ -101,9 +101,7 @@ static const mp_cmd_t mp_cmds[] = {
 #endif
   { MP_CMD_SEEK, "seek", { ARG_FLOAT, OARG_INT(0), OARG_INT(0) } },
   { MP_CMD_EDL_MARK, "edl_mark", },
-  { MP_CMD_SPEED_INCR, "speed_incr", { ARG_FLOAT } },
   { MP_CMD_SPEED_MULT, "speed_mult", { ARG_FLOAT } },
-  { MP_CMD_SPEED_SET, "speed_set", { ARG_FLOAT } },
   { MP_CMD_QUIT, "quit", { OARG_INT(0) } },
   { MP_CMD_STOP, "stop", },
   { MP_CMD_FRAME_STEP, "frame_step", },
@@ -198,6 +196,8 @@ static const struct legacy_cmd legacy_cmds[] = {
     {"step_property",           "no-osd switch"},
     {"set_property",            "no-osd set"},
     {"set_property_osd",        "set"},
+    {"speed_set",               "set speed"},
+    // Approximate
     {"pt_step 1",               "playlist_next"},
     {"pt_step -1",              "playlist_prev"},
     {0}
diff --git a/input/input.h b/input/input.h
index 52fdfb956b..aed05af78f 100644
--- a/input/input.h
+++ b/input/input.h
@@ -44,9 +44,7 @@ enum mp_command_type {
     MP_CMD_TV_SET_NORM,
     MP_CMD_SWITCH_RATIO,
     MP_CMD_FRAME_STEP,
-    MP_CMD_SPEED_INCR,
     MP_CMD_SPEED_MULT,
-    MP_CMD_SPEED_SET,
     MP_CMD_RUN,
     MP_CMD_SUB_LOAD,
     MP_CMD_KEYDOWN_EVENTS,
-- 
cgit v1.2.3