From eef281e89eff6e21a67a106d27fd38979ad20752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= Date: Sun, 7 Mar 2021 23:53:19 +0200 Subject: player/{core,loadfile}: make cover art loading more explicit Now loading cover art through mp_add_external_file requires an additional argument to be set to true. This way not all video-add commands end up being marked as cover art when they move through mp_add_external_file, as originally changed in 55d7f9ded197d82d172b7baf74b1a07640361ae8 . Additionally, this lets us clean up some logic that would otherwise be duplicated between open_external_files and autoload_external_files, if the logic had been kept split from mp_add_external_file. Fixes #8358 --- player/command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'player/command.c') diff --git a/player/command.c b/player/command.c index f28bd120be..96e5daef77 100644 --- a/player/command.c +++ b/player/command.c @@ -5260,7 +5260,7 @@ static void cmd_track_add(void *p) } } int first = mp_add_external_file(mpctx, cmd->args[0].v.s, type, - cmd->abort->cancel); + cmd->abort->cancel, false); if (first < 0) { cmd->success = false; return; @@ -5324,7 +5324,8 @@ static void cmd_track_reload(void *p) if (t && t->is_external && t->external_filename) { char *filename = talloc_strdup(NULL, t->external_filename); mp_remove_track(mpctx, t); - nt_num = mp_add_external_file(mpctx, filename, type, cmd->abort->cancel); + nt_num = mp_add_external_file(mpctx, filename, type, cmd->abort->cancel, + false); talloc_free(filename); } -- cgit v1.2.3