RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

player: cosmetically change around some code 

Is this better?
This commit is contained in:
wm4 2020-09-28 00:14:54 +02:00
parent 55d7f9ded1
commit e1536193cb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
player/loadfile.c
View File

@ -879,20 +879,20 @@ void autoload_external_files(struct MPContext *mpctx, struct mp_cancel *cancel)
} }
for (int i = 0; list && list[i].fname; i++) { for (int i = 0; list && list[i].fname; i++) {
char *filename = list[i].fname; struct subfn *e = &list[i];
char *lang = list[i].lang;
for (int n = 0; n < mpctx->num_tracks; n++) { for (int n = 0; n < mpctx->num_tracks; n++) {
struct track *t = mpctx->tracks[n]; struct track *t = mpctx->tracks[n];
if (t->demuxer && strcmp(t->demuxer->filename, filename) == 0) if (t->demuxer && strcmp(t->demuxer->filename, e->fname) == 0)
goto skip; goto skip;
} }
if (list[i].type == STREAM_SUB && !sc[STREAM_VIDEO] && !sc[STREAM_AUDIO]) if (e->type == STREAM_SUB && !sc[STREAM_VIDEO] && !sc[STREAM_AUDIO])
goto skip; goto skip;
if (list[i].type == STREAM_AUDIO && !sc[STREAM_VIDEO]) if (e->type == STREAM_AUDIO && !sc[STREAM_VIDEO])
goto skip; goto skip;
if (list[i].type == STREAM_VIDEO && (sc[STREAM_VIDEO] || !sc[STREAM_AUDIO])) if (e->type == STREAM_VIDEO && (sc[STREAM_VIDEO] || !sc[STREAM_AUDIO]))
goto skip; goto skip;
int first = mp_add_external_file(mpctx, filename, list[i].type, cancel); int first = mp_add_external_file(mpctx, e->fname, e->type, cancel);
if (first < 0) if (first < 0)
goto skip; goto skip;
@ -900,9 +900,9 @@ void autoload_external_files(struct MPContext *mpctx, struct mp_cancel *cancel)
struct track *t = mpctx->tracks[n]; struct track *t = mpctx->tracks[n];
t->auto_loaded = true; t->auto_loaded = true;
t->attached_picture = t->attached_picture =
t->type == STREAM_VIDEO && list[i].type == STREAM_VIDEO; t->type == STREAM_VIDEO && e->type == STREAM_VIDEO;
if (!t->lang) if (!t->lang)
t->lang = talloc_strdup(t, lang); t->lang = talloc_strdup(t, e->lang);
} }
skip:; skip:;
} }