From 419d31d4c3ad486320dd1391a5ed90a199cd9c55 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Fri, 16 Sep 2016 11:19:21 -0400 Subject: [PATCH] core/playlists/system: Drop support for looking up the "Banned" playlist This playlist has been the same as the hidden playlist for several releases now. Let's make the change official! Implements #28: Save hidden playlist as "hidden" instead of "banned" Signed-off-by: Anna Schumaker --- core/playlists/system.c | 7 ++++--- tests/core/playlists/system.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/playlists/system.c b/core/playlists/system.c index 5a94721c..73b42bf8 100644 --- a/core/playlists/system.c +++ b/core/playlists/system.c @@ -384,9 +384,6 @@ static struct sys_playlist * __sys_pl_lookup(const gchar *name) if (string_match(name, sys_playlists[i]->spl_playlist.pl_name)) return sys_playlists[i]; } - - if (string_match(name, "Banned")) - return &sys_hidden; return NULL; } @@ -457,6 +454,10 @@ static bool __sys_pl_load() file_readf(&sys_file, "%u\n", &n); for (i = 0; i < n; i++) { file_readf(&sys_file, "%*u %m[^\n]\n", &name); + if (string_match(name, "Banned")) { + g_free(name); + name = g_strdup("Hidden"); + } plist = __sys_pl_lookup(name); if (plist) diff --git a/tests/core/playlists/system.c b/tests/core/playlists/system.c index 966b069a..6a582b22 100644 --- a/tests/core/playlists/system.c +++ b/tests/core/playlists/system.c @@ -147,7 +147,7 @@ static void test_hidden() struct queue *queue = playlist_get_queue(PL_SYSTEM, "Hidden"); g_assert_nonnull(queue); - g_assert(playlist_get_queue(PL_SYSTEM, "Banned") == queue); + g_assert_null(playlist_get_queue(PL_SYSTEM, "Banned")); g_assert_false(queue_has_flag(queue, Q_ADD_FRONT)); g_assert_true(queue_has_flag(queue, Q_REPEAT));