diff --git a/gui/playlist.c b/gui/playlist.c
index 29379daf..4a167f2e 100644
--- a/gui/playlist.c
+++ b/gui/playlist.c
@@ -10,26 +10,24 @@
enum playlist_sidebar_columns {
P_SB_IMAGE,
P_SB_NAME,
- P_SB_PLAYLIST,
};
static GtkTreeStore *p_store;
static gchar *p_name;
static void __playlist_set(GtkTreeIter *iter, const gchar *name,
- const gchar *image, enum playlist_t plist)
+ const gchar *image)
{
gtk_tree_store_set(p_store, iter, P_SB_NAME, name,
- P_SB_IMAGE, image,
- P_SB_PLAYLIST, plist, -1);
+ P_SB_IMAGE, image, -1);
}
static void __playlist_add(GtkTreeIter *parent, const gchar *name,
- const gchar *image, enum playlist_t plist)
+ const gchar *image)
{
GtkTreeIter iter;
gtk_tree_store_insert(p_store, &iter, parent, -1);
- __playlist_set(&iter, name, image, plist);
+ __playlist_set(&iter, name, image);
}
void __playlist_selection_changed(GtkTreeSelection *selection, gpointer data)
@@ -72,15 +70,14 @@ void gui_playlist_init()
/* Add "Playlist" header. */
gtk_tree_store_insert(p_store, &parent, NULL, -1);
gtk_tree_store_insert(p_store, &parent, NULL, -1);
- __playlist_set(&parent, "Playlists",
- "emblem-documents", 0);
+ __playlist_set(&parent, "Playlists", "emblem-documents");
/* Add playlists. */
- __playlist_add(&parent, "Favorites", "emblem-favorite", PL_FAVORITED);
- __playlist_add(&parent, "Hidden", "window-close",PL_HIDDEN);
- __playlist_add(&parent, "Most Played", "go-up", PL_MOST_PLAYED);
- __playlist_add(&parent, "Least Played", "go-down", PL_LEAST_PLAYED);
- __playlist_add(&parent, "Unplayed", "audio-x-generic", PL_UNPLAYED);
+ __playlist_add(&parent, "Favorites", "emblem-favorite");
+ __playlist_add(&parent, "Hidden", "face-sad");
+ __playlist_add(&parent, "Most Played", "go-up");
+ __playlist_add(&parent, "Least Played", "go-down");
+ __playlist_add(&parent, "Unplayed", "audio-x-generic");
treeview = GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"));
gtk_tree_view_expand_all(treeview);
diff --git a/include/core/playlist.h b/include/core/playlist.h
index ce289ffa..b168d065 100644
--- a/include/core/playlist.h
+++ b/include/core/playlist.h
@@ -11,14 +11,6 @@
#include
#include
-enum playlist_t {
- PL_FAVORITED, /* Songs that the user likes. */
- PL_HIDDEN, /* Songs that the user has hidden. */
- PL_UNPLAYED, /* Songs that have not been played yet. */
- PL_MOST_PLAYED, /* Songs with an above average play count. */
- PL_LEAST_PLAYED, /* Songs with a below average play count. */
-};
-
/* Called to initialize the playlist manager. */
void playlist_init(struct queue_ops *);
diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade
index 49149d8b..bef22339 100644
--- a/share/ocarina/ocarina6.glade
+++ b/share/ocarina/ocarina6.glade
@@ -256,8 +256,6 @@
-
-