diff options
| author | wm4 <wm4@nowhere> | 2012-09-15 02:04:57 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-12 10:10:30 +0200 |
| commit | a749c614375107a09e5877f6bb654133c7947672 (patch) | |
| tree | 6c09bd53643d38178d7c4d07be2757620da5acfc /input/input.c | |
| parent | 950999dd7bcf863535634e2ac227d19979beadd4 (diff) | |
| download | mpv-a749c614375107a09e5877f6bb654133c7947672.tar.bz2 mpv-a749c614375107a09e5877f6bb654133c7947672.tar.xz | |
commands: rename osd_show_[property_]text and osd_show_progression
osd_show_[property_]text => show_text
osd_show_progression => show_progress
show_text, osd_show_property_text and osd_show_text both map to the
code for the previous osd_show_property_text. The only special thing
about osd_show_text is that you don't need to escape "$". Also,
unfortunately osd_show_property_text requires escaping things twice,
one time for the command parser, and the other time for the property
formatting code, while osd_show_text needed only one level of escaping.
Diffstat (limited to 'input/input.c')
| -rw-r--r-- | input/input.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/input/input.c b/input/input.c index a4575d8f37..abaa6fd7bd 100644 --- a/input/input.c +++ b/input/input.c @@ -109,9 +109,8 @@ static const mp_cmd_t mp_cmds[] = { { MP_CMD_PLAYLIST_PREV, "playlist_prev", { OARG_INT(0) } }, { MP_CMD_SUB_STEP, "sub_step", { ARG_INT, OARG_INT(0) } }, { MP_CMD_OSD, "osd", { OARG_INT(-1) } }, - { MP_CMD_OSD_SHOW_TEXT, "osd_show_text", { ARG_STRING, OARG_INT(-1), OARG_INT(0) } }, - { MP_CMD_OSD_SHOW_PROPERTY_TEXT, "osd_show_property_text", { ARG_STRING, OARG_INT(-1), OARG_INT(0) } }, - { MP_CMD_OSD_SHOW_PROGRESSION, "osd_show_progression", }, + { MP_CMD_SHOW_TEXT, "show_text", { ARG_STRING, OARG_INT(-1), OARG_INT(0) } }, + { MP_CMD_SHOW_PROGRESS, "show_progress", }, { MP_CMD_SUB_LOAD, "sub_load", { ARG_STRING } }, #ifdef CONFIG_TV { MP_CMD_TV_START_SCAN, "tv_start_scan", }, @@ -197,6 +196,9 @@ static const struct legacy_cmd legacy_cmds[] = { {"set_property", "no-osd set"}, {"set_property_osd", "set"}, {"speed_set", "set speed"}, + {"osd_show_text", "show_text"}, + {"osd_show_property_text", "show_text"}, + {"osd_show_progression", "show_progress"}, // Approximate {"pt_step 1", "playlist_next"}, {"pt_step -1", "playlist_prev"}, |