From 85bfe717ddf07c579f006cd8049301d6f4bb7a9f Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Sun, 11 Sep 2016 09:52:26 -0400 Subject: [PATCH] core/tags/library: Remove unused li_size variable This was used to display the number of tracks in each library path. We can use playlist functions to get this information now. Signed-off-by: Anna Schumaker --- core/tags/library.c | 1 - core/tags/track.c | 4 ---- include/core/tags/library.h | 7 +++---- tests/core/tags/library.c | 5 ----- tests/core/tags/track.c | 9 ++------- 5 files changed, 5 insertions(+), 21 deletions(-) diff --git a/core/tags/library.c b/core/tags/library.c index f86b72bc..77fe6f19 100644 --- a/core/tags/library.c +++ b/core/tags/library.c @@ -12,7 +12,6 @@ static struct library *__library_alloc(gchar *path) struct library *library = g_malloc(sizeof(struct library)); dbe_init(&library->li_dbe, library); - library->li_size = 0; library->li_path = path; library->li_playlist = NULL; diff --git a/core/tags/track.c b/core/tags/track.c index b9fc4b7c..358465ed 100644 --- a/core/tags/track.c +++ b/core/tags/track.c @@ -100,8 +100,6 @@ static void track_free(struct db_entry *dbe) play_count -= track->tr_count; if (track->tr_count == 0) unplayed_count--; - if (track->tr_library) - track->tr_library->li_size--; g_strfreev(track->tr_tokens); g_strfreev(track->tr_alts); @@ -111,8 +109,6 @@ static void track_free(struct db_entry *dbe) static void track_setup(struct db_entry *dbe) { - struct track *track = TRACK(dbe); - track->tr_library->li_size++; } static gchar *track_key(struct db_entry *dbe) diff --git a/include/core/tags/library.h b/include/core/tags/library.h index 577e8049..a19aabc0 100644 --- a/include/core/tags/library.h +++ b/include/core/tags/library.h @@ -16,10 +16,9 @@ #include struct library { - unsigned int li_size; /* This library's track count. */ - gchar *li_path; /* This library's root path. */ - void *li_playlist; /* This library's associated playlist. */ - struct db_entry li_dbe; + gchar *li_path; /* This library's root path. */ + void *li_playlist; /* This library's associated playlist. */ + struct db_entry li_dbe; }; #define LIBRARY(dbe) ((struct library *)DBE_DATA(dbe)) diff --git a/tests/core/tags/library.c b/tests/core/tags/library.c index b3a6a437..692d2f55 100644 --- a/tests/core/tags/library.c +++ b/tests/core/tags/library.c @@ -7,7 +7,6 @@ static void test_verify_zelda(struct library *library) { const struct db_ops *library_ops = test_library_ops(); - g_assert_cmpuint(library->li_size, ==, 0); g_assert_null(library->li_playlist); g_assert_cmpstr(library_ops->dbe_key(&library->li_dbe), ==, "/home/Zelda/Music"); } @@ -15,7 +14,6 @@ static void test_verify_zelda(struct library *library) static void test_verify_link(struct library *library) { const struct db_ops *library_ops = test_library_ops(); - g_assert_cmpuint(library->li_size, ==, 0); g_assert_null(library->li_playlist); g_assert_cmpstr(library_ops->dbe_key(&library->li_dbe), ==, "/home/Link/Music"); } @@ -32,9 +30,6 @@ static void test_library() test_verify_link(link); test_verify_zelda(zelda); - link->li_size = 21; - zelda->li_size = 42; - file_init(&f, "library_tag", 0, 0); file_open(&f, OPEN_WRITE); library_ops->dbe_write(&f, &link->li_dbe); diff --git a/tests/core/tags/track.c b/tests/core/tags/track.c index 9ab443d9..be2e7bb6 100644 --- a/tests/core/tags/track.c +++ b/tests/core/tags/track.c @@ -71,21 +71,19 @@ static void test_track() const struct db_ops *track_ops = test_track_ops(); time_t rawtime = time(NULL); struct tm *now = localtime(&rawtime); - struct library *library; struct track *track; struct file f; gchar *date; file_init(&f, "track_tag", 1, 1); - date = string_tm2str(now); - library = library_find("tests/Music"); + g_assert_nonnull(library_find("tests/Music")); + date = string_tm2str(now); track = test_alloc("0/Hyrule Symphony/01 - Title Theme.ogg"); g_assert_nonnull(track); track->tr_dbe.dbe_index = 0; track_ops->dbe_setup(&track->tr_dbe); test_verify_track(track); - g_assert_cmpuint(library->li_size, ==, 1); g_assert_true( track_match_token(track, "title")); g_assert_true( track_match_token(track, "theme")); @@ -99,14 +97,12 @@ static void test_track() g_free(track->tr_path); track_ops->dbe_free(&track->tr_dbe); - g_assert_cmpuint(library->li_size, ==, 0); file_open(&f, OPEN_READ); track = TRACK(track_ops->dbe_read(&f)); track->tr_dbe.dbe_index = 0; track_ops->dbe_setup(&track->tr_dbe); test_verify_notrack(track); - g_assert_cmpuint(library->li_size, ==, 1); g_free(track->tr_path); track_ops->dbe_free(&track->tr_dbe); @@ -115,7 +111,6 @@ static void test_track() track->tr_dbe.dbe_index = 0; track_ops->dbe_setup(&track->tr_dbe); test_verify_track(track); - g_assert_cmpuint(library->li_size, ==, 1); file_close(&f); track_played(track);