summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorgpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-03 14:08:28 +0000
committergpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-03 14:08:28 +0000
commit9e909f0dde36431c457922e1f66fff0c1d6e71ac (patch)
tree008569d4fe4ec81c58af17ad8b25d16138f312ec /input
parentacf7defdcf8c22504cee6333b9d9164d34e4f8db (diff)
downloadmpv-9e909f0dde36431c457922e1f66fff0c1d6e71ac.tar.bz2
mpv-9e909f0dde36431c457922e1f66fff0c1d6e71ac.tar.xz
Added support of audio stream switching in the MPEG demuxer using the #-key
Patch by Michael Behrisch < behrisch $ informatik * hu-berlin * de > commited with the kind blessing of D. Richard Felker III git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15047 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
-rw-r--r--input/input.c2
-rw-r--r--input/input.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/input/input.c b/input/input.c
index 97e6583b9b..a1470f1bd1 100644
--- a/input/input.c
+++ b/input/input.c
@@ -82,6 +82,7 @@ static mp_cmd_t mp_cmds[] = {
{ MP_CMD_SUB_LOG, "sub_log", 0, { {-1,{0}} } },
{ MP_CMD_GET_PERCENT_POS, "get_percent_pos", 0, { {-1,{0}} } },
{ MP_CMD_GET_TIME_LENGTH, "get_time_length", 0, { {-1,{0}} } },
+ { MP_CMD_SWITCH_AUDIO, "switch_audio", 0, { {-1,{0}} } },
#ifdef USE_TV
{ MP_CMD_TV_STEP_CHANNEL, "tv_step_channel", 1, { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} }},
{ MP_CMD_TV_STEP_NORM, "tv_step_norm",0, { {-1,{0}} } },
@@ -317,6 +318,7 @@ static mp_cmd_bind_t def_cmd_binds[] = {
{ { 'b', 0 }, "sub_select" },
{ { 'j', 0 }, "vobsub_lang" },
{ { 'F', 0 }, "forced_subs_only" },
+ { { '#', 0 }, "switch_audio" },
#ifdef USE_EDL
{ { 'i', 0 }, "edl_mark" },
#endif
diff --git a/input/input.h b/input/input.h
index 26a0d83ea5..de0a64962f 100644
--- a/input/input.h
+++ b/input/input.h
@@ -63,6 +63,7 @@
#define MP_CMD_SPEED_SET 59
#define MP_CMD_RUN 60
#define MP_CMD_SUB_LOG 61
+#define MP_CMD_SWITCH_AUDIO 62
#define MP_CMD_GUI_EVENTS 5000
#define MP_CMD_GUI_LOADFILE 5001