diff options
| author | wm4 <wm4@nowhere> | 2013-10-31 23:25:55 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-10-31 23:30:14 +0100 |
| commit | 39fc0060fb1a2889256e56c1e33421d21ac0f8cf (patch) | |
| tree | b9b6133481dbeebb4af264a0c6f23e89b3510f6d /mpvcore | |
| parent | 71ded03123a704ddcbf018dcb0ec633475ccb04a (diff) | |
| download | mpv-39fc0060fb1a2889256e56c1e33421d21ac0f8cf.tar.bz2 mpv-39fc0060fb1a2889256e56c1e33421d21ac0f8cf.tar.xz | |
command: replace speed_mult with multiply command
The compatibility layer still takes care of the old speed_mult command.
Diffstat (limited to 'mpvcore')
| -rw-r--r-- | mpvcore/input/input.c | 2 | ||||
| -rw-r--r-- | mpvcore/input/input.h | 1 | ||||
| -rw-r--r-- | mpvcore/player/command.c | 8 |
3 files changed, 1 insertions, 10 deletions
diff --git a/mpvcore/input/input.c b/mpvcore/input/input.c index aaa9cc14df..f3da874bde 100644 --- a/mpvcore/input/input.c +++ b/mpvcore/input/input.c @@ -142,7 +142,6 @@ static const mp_cmd_t mp_cmds[] = { {"exact", 1}, {"1", 1}, {"keyframes", -1}, {"-1", -1})), }}, - { MP_CMD_SPEED_MULT, "speed_mult", { ARG_DOUBLE } }, { MP_CMD_QUIT, "quit", { OARG_INT(0) } }, { MP_CMD_QUIT_WATCH_LATER, "quit_watch_later", }, { MP_CMD_STOP, "stop", }, @@ -291,6 +290,7 @@ static const struct legacy_cmd legacy_cmds[] = { {"show_tracks_osd", "show_text ${track-list}"}, {"!show_tracks", "show_text ${track-list}"}, {"!show_playlist", "show_text ${playlist}"}, + {"!speed_mult", "multiply speed"}, // Approximate (can fail if user added additional whitespace) {"pt_step 1", "playlist_next"}, diff --git a/mpvcore/input/input.h b/mpvcore/input/input.h index b3e8ae9543..8ea1070f8b 100644 --- a/mpvcore/input/input.h +++ b/mpvcore/input/input.h @@ -50,7 +50,6 @@ enum mp_command_type { MP_CMD_TV_SET_NORM, MP_CMD_FRAME_STEP, MP_CMD_FRAME_BACK_STEP, - MP_CMD_SPEED_MULT, MP_CMD_RUN, MP_CMD_SUB_ADD, MP_CMD_SUB_REMOVE, diff --git a/mpvcore/player/command.c b/mpvcore/player/command.c index 172a799c03..bacc37aa27 100644 --- a/mpvcore/player/command.c +++ b/mpvcore/player/command.c @@ -2542,14 +2542,6 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd) break; } - case MP_CMD_SPEED_MULT: { - double v = cmd->args[0].v.d * cmd->scale; - v *= mpctx->opts->playback_speed; - mp_property_do("speed", M_PROPERTY_SET, &v, mpctx); - show_property_osd(mpctx, "speed", cmd->on_osd); - break; - } - case MP_CMD_FRAME_STEP: add_step_frame(mpctx, 1); break; |