diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
| commit | 7795726e0f8c70edd6ecde7fd2137214af302f4f (patch) | |
| tree | 87a087e69a0e2912183736de409676f824fb2248 /input | |
| parent | ba3b65b92f3f822fa75b0210b841557f5b20f6d1 (diff) | |
| parent | e16f02fe4001f3056b8efd1a099a563569b73f5d (diff) | |
| download | mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.bz2 mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.xz | |
Merge svn changes up to r31033
Diffstat (limited to 'input')
| -rw-r--r-- | input/input.c | 7 | ||||
| -rw-r--r-- | input/input.h | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/input/input.c b/input/input.c index 1fdb0972e3..a751cc2fc3 100644 --- a/input/input.c +++ b/input/input.c @@ -105,6 +105,7 @@ static const mp_cmd_t mp_cmds[] = { { MP_CMD_OSD, "osd",0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } }, { MP_CMD_OSD_SHOW_TEXT, "osd_show_text", 1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_INT,{-1}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_OSD_SHOW_PROPERTY_TEXT, "osd_show_property_text",1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_INT,{-1}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, + { MP_CMD_OSD_SHOW_PROGRESSION, "osd_show_progression", 0, { {-1,{0}} } }, { MP_CMD_VOLUME, "volume", 1, { { MP_CMD_ARG_FLOAT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_BALANCE, "balance", 1, { { MP_CMD_ARG_FLOAT,{0} }, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_MIXER_USEMASTER, "use_master", 0, { {-1,{0}} } }, @@ -210,6 +211,11 @@ static const mp_cmd_t mp_cmds[] = { { MP_CMD_SEEK_CHAPTER, "seek_chapter", 1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, { MP_CMD_SET_MOUSE_POS, "set_mouse_pos", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, + { MP_CMD_AF_SWITCH, "af_switch", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, + { MP_CMD_AF_ADD, "af_add", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, + { MP_CMD_AF_DEL, "af_del", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, + { MP_CMD_AF_CLR, "af_clr", 0, { {-1,{0}} } }, + { 0, NULL, 0, {} } }; @@ -402,6 +408,7 @@ static const mp_cmd_bind_t def_cmd_binds[] = { { { KEY_DEL, 0 }, "alt_src_step -1" }, { { 'o', 0 }, "osd" }, { { 'I', 0 }, "osd_show_property_text \"${filename}\"" }, + { { 'P', 0 }, "osd_show_progression" }, { { 'z', 0 }, "sub_delay -0.1" }, { { 'x', 0 }, "sub_delay +0.1" }, { { 'g', 0 }, "sub_step -1" }, diff --git a/input/input.h b/input/input.h index b992b13d1c..7aa5af0f55 100644 --- a/input/input.h +++ b/input/input.h @@ -93,6 +93,7 @@ typedef enum { MP_CMD_SET_PROPERTY_OSD, MP_CMD_GET_PROPERTY, MP_CMD_OSD_SHOW_PROPERTY_TEXT, + MP_CMD_OSD_SHOW_PROGRESSION, MP_CMD_SEEK_CHAPTER, MP_CMD_FILE_FILTER, MP_CMD_GET_FILENAME, @@ -149,6 +150,13 @@ typedef enum { MP_CMD_CHELP = 7000, MP_CMD_CEXIT, MP_CMD_CHIDE, + + /// Audio Filter commands + MP_CMD_AF_SWITCH, + MP_CMD_AF_ADD, + MP_CMD_AF_DEL, + MP_CMD_AF_CLR, + } mp_command_type; // The arg types |