summaryrefslogtreecommitdiffstats
path: root/command.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-15 01:48:27 +0200
committerwm4 <wm4@nowhere>2012-10-12 10:10:30 +0200
commit950999dd7bcf863535634e2ac227d19979beadd4 (patch)
tree788d6f98185ae44134e15b38fa92b3ca9cef2d23 /command.c
parent4e2fab5846d2fe7f51a799abb4118515efac854b (diff)
downloadmpv-950999dd7bcf863535634e2ac227d19979beadd4.tar.bz2
mpv-950999dd7bcf863535634e2ac227d19979beadd4.tar.xz
commands: remove speed_set/speed_incr commands
Redundant with set/switch commands.
Diffstat (limited to 'command.c')
-rw-r--r--command.c17
1 files changed, 2 insertions, 15 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");