diff options
| author | wm4 <wm4@nowhere> | 2012-08-19 18:01:30 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-09-18 21:04:45 +0200 |
| commit | 0f155921b046c9e6cfed3fe601aa891c2d2a8b16 (patch) | |
| tree | ced8b2b76d00f3461bf12d0b5063ce2cf6fb8fe8 /input | |
| parent | 13482fb397ce6bbcec8a9342015f21d48fb7efe6 (diff) | |
| download | mpv-0f155921b046c9e6cfed3fe601aa891c2d2a8b16.tar.bz2 mpv-0f155921b046c9e6cfed3fe601aa891c2d2a8b16.tar.xz | |
core: manage tracks in the frontend
Introduce a general track struct for every audio/video/subtitle track
known to the frontend. External files (subtitles) are now represented
as tracks too. This mainly serves to clean up the subtitle selection
code: now every subtitle is simply a track, instead of using a messy
numbering that goes by subtitle type (as it was stored in the
global_sub_pos field). The mplayer fontend will list external subtitle
files as additional tracks.
The timeline code now tries to match the exact demuxer IDs of all
tracks. This may cause problems when Matroska files with different
track numberings are used with EDL timelines. Change demux_lavf not
to set demuxer IDs, since most time they are not set.
Diffstat (limited to 'input')
| -rw-r--r-- | input/input.c | 4 | ||||
| -rw-r--r-- | input/input.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/input/input.c b/input/input.c index 4ea9e0c531..d1136532ed 100644 --- a/input/input.c +++ b/input/input.c @@ -134,10 +134,6 @@ static const mp_cmd_t mp_cmds[] = { { MP_CMD_SUB_LOAD, "sub_load", { ARG_STRING } }, { MP_CMD_SUB_SELECT, "vobsub_lang", { OARG_INT(-2) } }, // for compatibility { MP_CMD_SUB_SELECT, "sub_select", { OARG_INT(-2) } }, - { MP_CMD_SUB_SOURCE, "sub_source", { OARG_INT(-2) } }, - { MP_CMD_SUB_VOB, "sub_vob", { OARG_INT(-2) } }, - { MP_CMD_SUB_DEMUX, "sub_demux", { OARG_INT(-2) } }, - { MP_CMD_SUB_FILE, "sub_file", { OARG_INT(-2) } }, { MP_CMD_SUB_SCALE, "sub_scale", { ARG_FLOAT, OARG_INT(0) } }, #ifdef CONFIG_ASS { MP_CMD_ASS_USE_MARGINS, "ass_use_margins", { OARG_INT(-1) } }, diff --git a/input/input.h b/input/input.h index e1e333c486..a055b59138 100644 --- a/input/input.h +++ b/input/input.h @@ -118,10 +118,6 @@ enum mp_command_type { MP_CMD_BALANCE, MP_CMD_SUB_SCALE, MP_CMD_TV_START_SCAN, - MP_CMD_SUB_SOURCE, - MP_CMD_SUB_FILE, - MP_CMD_SUB_VOB, - MP_CMD_SUB_DEMUX, MP_CMD_SWITCH_ANGLE, MP_CMD_ASS_USE_MARGINS, MP_CMD_SWITCH_TITLE, |