From f7fb6f85329ba0ba5a4b811268925be49667011a Mon Sep 17 00:00:00 2001 From: ejurgensen Date: Fri, 10 Jan 2025 20:37:45 +0100 Subject: [PATCH] [settings] Move two settings to artwork category show_cover_artwork_in_album_lists and streamurl_ignore. Ref #1829. --- src/inputs/http.c | 2 +- src/settings.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/inputs/http.c b/src/inputs/http.c index ad0c26dd..c53ef10f 100644 --- a/src/inputs/http.c +++ b/src/inputs/http.c @@ -293,7 +293,7 @@ metadata_prepare(struct input_source *source) // Note we map title to album, because clients should show stream name as title swap_pointers(&prepared_metadata.parsed.album, &m->title); - if (! SETTINGS_GETBOOL("misc", "streamurl_ignore")) + if (! SETTINGS_GETBOOL("artwork", "streamurl_ignore")) { // In this case we have to go async to download the url and process the content if (m->url && !artwork_extension_is_artwork(m->url)) diff --git a/src/settings.c b/src/settings.c index 8bb13fa0..79582339 100644 --- a/src/settings.c +++ b/src/settings.c @@ -30,7 +30,6 @@ static struct settings_option webinterface_options[] = { "show_composer_now_playing", SETTINGS_TYPE_BOOL }, { "show_filepath_now_playing", SETTINGS_TYPE_BOOL }, { "show_composer_for_genre", SETTINGS_TYPE_STR }, - { "show_cover_artwork_in_album_lists", SETTINGS_TYPE_BOOL, { true } }, { "show_menu_item_playlists", SETTINGS_TYPE_BOOL, { true } }, { "show_menu_item_music", SETTINGS_TYPE_BOOL, { true } }, { "show_menu_item_podcasts", SETTINGS_TYPE_BOOL, { true } }, @@ -49,13 +48,14 @@ static struct settings_option artwork_options[] = { "use_artwork_source_spotify", SETTINGS_TYPE_BOOL, { true } }, { "use_artwork_source_discogs", SETTINGS_TYPE_BOOL, { false } }, { "use_artwork_source_coverartarchive", SETTINGS_TYPE_BOOL, { false } }, + { "show_cover_artwork_in_album_lists", SETTINGS_TYPE_BOOL, { true } }, + { "streamurl_ignore", SETTINGS_TYPE_BOOL, { false } }, }; static struct settings_option misc_options[] = { { "streamurl_keywords_artwork_url", SETTINGS_TYPE_STR }, { "streamurl_keywords_length", SETTINGS_TYPE_STR }, - { "streamurl_ignore", SETTINGS_TYPE_BOOL }, }; static struct settings_option player_options[] =