From d7fb67ed51df26ba2f6a164d888f3011f9939831 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Tue, 17 Apr 2018 08:08:56 -0400 Subject: [PATCH] core/playlists: Remove unsorted playlist_generic_init() We can just pass 0 to the sorted function to indicate that the playlist shouldn't be sorted by default. Let's also take this chance to rename playlist_generic_init_sorted() -> playlist_generic_init() Signed-off-by: Anna Schumaker --- core/playlists/generic.c | 26 +++++++++----------------- core/playlists/system.c | 7 +++---- core/playlists/user.c | 2 +- include/core/playlists/generic.h | 3 +-- tests/core/playlist.c | 12 ++++++------ 5 files changed, 20 insertions(+), 30 deletions(-) diff --git a/core/playlists/generic.c b/core/playlists/generic.c index c3c3bc11..b9e6db3e 100644 --- a/core/playlists/generic.c +++ b/core/playlists/generic.c @@ -38,20 +38,7 @@ void playlist_generic_set_callbacks(struct playlist_callbacks *cb) callbacks = cb; } -void playlist_generic_init(struct playlist *playlist) -{ - if (playlist) { - g_queue_init(&playlist->pl_tracks); - playlist->pl_length = 0; - playlist->pl_random = false; - playlist->pl_current = NULL; - playlist->pl_sort = NULL; - playlist->pl_search = NULL; - } -} - -void playlist_generic_init_sorted(struct playlist *playlist, - unsigned int nargs, ...) +void playlist_generic_init(struct playlist *playlist, unsigned int nargs, ...) { unsigned int i; va_list argp; @@ -59,7 +46,12 @@ void playlist_generic_init_sorted(struct playlist *playlist, if (!playlist) return; - playlist_generic_init(playlist); + g_queue_init(&playlist->pl_tracks); + playlist->pl_length = 0; + playlist->pl_random = false; + playlist->pl_current = NULL; + playlist->pl_sort = NULL; + playlist->pl_search = NULL; va_start(argp, nargs); for (i = 0; i < nargs; i++) @@ -88,8 +80,8 @@ struct playlist *playlist_generic_alloc(gchar *name, enum playlist_type_t type, playlist->pl_id = id; playlist->pl_ops = ops; - playlist_generic_init_sorted(playlist, 4, COMPARE_ARTIST, COMPARE_YEAR, - COMPARE_ALBUM, COMPARE_TRACK); + playlist_generic_init(playlist, 4, COMPARE_ARTIST, COMPARE_YEAR, + COMPARE_ALBUM, COMPARE_TRACK); if (callbacks) callbacks->pl_cb_alloc(playlist); return playlist; diff --git a/core/playlists/system.c b/core/playlists/system.c index c15d7968..d6d9967f 100644 --- a/core/playlists/system.c +++ b/core/playlists/system.c @@ -414,7 +414,7 @@ void pl_system_init(void) switch (i) { case SYS_PL_QUEUED: case SYS_PL_HISTORY: - playlist_generic_init(playlist); + playlist_generic_init(playlist, 0); break; case SYS_PL_COLLECTION: case SYS_PL_UNPLAYED: @@ -423,9 +423,8 @@ void pl_system_init(void) sys_pl_update(playlist); case SYS_PL_FAVORITES: case SYS_PL_HIDDEN: - playlist_generic_init_sorted(playlist, 4, - COMPARE_ARTIST, COMPARE_YEAR, - COMPARE_ALBUM, COMPARE_TRACK); + playlist_generic_init(playlist, 4, COMPARE_ARTIST, + COMPARE_YEAR, COMPARE_ALBUM, COMPARE_TRACK); break; } } diff --git a/core/playlists/user.c b/core/playlists/user.c index e2fd18af..50c18b2b 100644 --- a/core/playlists/user.c +++ b/core/playlists/user.c @@ -15,7 +15,7 @@ static struct user_playlist *__user_db_alloc(gchar *name, unsigned int index) playlist->pl_playlist.pl_type = PL_USER; playlist->pl_playlist.pl_id = index; playlist->pl_playlist.pl_ops = &user_ops; - playlist_generic_init(&playlist->pl_playlist); + playlist_generic_init(&playlist->pl_playlist, 0); return playlist; } diff --git a/include/core/playlists/generic.h b/include/core/playlists/generic.h index 54bfe564..5bc2b5b5 100644 --- a/include/core/playlists/generic.h +++ b/include/core/playlists/generic.h @@ -40,8 +40,7 @@ struct playlist_callbacks { void playlist_generic_set_callbacks(struct playlist_callbacks *); /* Generic playlist init functions. */ -void playlist_generic_init(struct playlist *); -void playlist_generic_init_sorted(struct playlist *, unsigned int, ...); +void playlist_generic_init(struct playlist *, unsigned int, ...); /* Generic playlist deinit function. */ void playlist_generic_deinit(struct playlist *); diff --git a/tests/core/playlist.c b/tests/core/playlist.c index 8633e5a6..70fd03cb 100644 --- a/tests/core/playlist.c +++ b/tests/core/playlist.c @@ -49,8 +49,7 @@ static void test_null() g_assert_false(playlist_delete(NULL)); playlist_generic_free(NULL); - playlist_generic_init(NULL); - playlist_generic_init_sorted(NULL, 0); + playlist_generic_init(NULL, 0); playlist_generic_deinit(NULL); g_assert_null(playlist_lookup(PL_MAX_TYPE, "NULL")); @@ -110,9 +109,10 @@ static void test_playlist() int i; g_assert_cmpuint(playlist_size(&p), ==, 0); - playlist_generic_init(&p); + playlist_generic_init(&p, 0); g_assert_cmpuint(playlist_size(&p), ==, 0); g_assert_cmpuint(p.pl_length, ==, 0); + g_assert_cmpuint(g_slist_length(p.pl_sort), ==, 0); for (i = 0; i < 13; i++) { ex_length += track_get(i)->tr_length; @@ -202,8 +202,8 @@ static void test_sorting() struct track *track; unsigned int i; - playlist_generic_init_sorted(&p, 4, COMPARE_ARTIST, COMPARE_YEAR, - COMPARE_ALBUM, COMPARE_TRACK); + playlist_generic_init(&p, 4, COMPARE_ARTIST, COMPARE_YEAR, + COMPARE_ALBUM, COMPARE_TRACK); g_assert_cmpuint(g_slist_length(p.pl_sort), ==, 4); playlist_clear_sort(&p); g_assert_cmpuint(g_slist_length(p.pl_sort), ==, 0); @@ -287,7 +287,7 @@ static void test_next() unsigned int i; g_random_set_seed(0); - playlist_generic_init(&p); + playlist_generic_init(&p, 0); for (i = 0; i < 13; i++) playlist_generic_add(&p, track_get(i));