RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-09 23:58:06 +00:00
Code Issues Releases Wiki Activity

mplayer: re-add some legacy slave mode output for issue #92

Browse Source 
In the long run this should be done differently. ID_... output sucks.
This commit will be reverted as soon as I have a good idea how this
should be done properly.
This commit is contained in:
wm4 2013-05-21 00:32:38 +02:00
parent 08bfe8721c
commit 9ccb1739b2
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/mplayer.c
View File

@ -252,21 +252,22 @@ static double get_play_end_pts(struct MPContext *mpctx)
return MP_NOPTS_VALUE;
}
static void print_stream(struct MPContext *mpctx, struct track *t, int id)
static void print_stream(struct MPContext *mpctx, struct track *t)
{
struct sh_stream *s = t->stream;
const char *tname = "?";
const char *selopt = "?";
const char *langopt = "?";
const char *iid = NULL;
switch (t->type) {
case STREAM_VIDEO:
tname = "Video"; selopt = "vid"; langopt = NULL;
tname = "Video"; selopt = "vid"; langopt = NULL; iid = "VID";
break;
case STREAM_AUDIO:
tname = "Audio"; selopt = "aid"; langopt = "alang";
tname = "Audio"; selopt = "aid"; langopt = "alang"; iid = "AID";
break;
case STREAM_SUB:
tname = "Subs"; selopt = "sid"; langopt = "slang";
tname = "Subs"; selopt = "sid"; langopt = "slang"; iid = "SID";
break;
}
mp_msg(MSGT_CPLAYER, MSGL_INFO, "[stream] %-5s %3s",
@ -289,6 +290,15 @@ static void print_stream(struct MPContext *mpctx, struct track *t, int id)
if (t->is_external)
mp_msg(MSGT_CPLAYER, MSGL_INFO, " (external)");
mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n");
// legacy compatibility
if (!iid)
return;
int id = t->user_tid;
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_%s_ID=%d\n", iid, id);
if (t->title)
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_%s_%d_NAME=%s\n", iid, id, t->title);
if (t->lang)
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_%s_%d_LANG=%s\n", iid, id, t->lang);
}
static void print_file_properties(struct MPContext *mpctx, const char *filename)
@ -369,7 +379,7 @@ static void print_file_properties(struct MPContext *mpctx, const char *filename)
for (int t = 0; t < STREAM_TYPE_COUNT; t++) {
for (int n = 0; n < mpctx->num_tracks; n++)
if (mpctx->tracks[n]->type == t)
print_stream(mpctx, mpctx->tracks[n], n);
print_stream(mpctx, mpctx->tracks[n]);
}
}