anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

core/playlist: Remove unused playlist_t enum 

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2016-04-27 09:41:17 -04:00 committed by Anna Schumaker
parent 5e9b6bc975
commit 00dd72d46e
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gui/playlist.c
View File

@ -10,26 +10,24 @@
enum playlist_sidebar_columns { enum playlist_sidebar_columns {
P_SB_IMAGE, P_SB_IMAGE,
P_SB_NAME, P_SB_NAME,
P_SB_PLAYLIST,
}; };
static GtkTreeStore *p_store; static GtkTreeStore *p_store;
static gchar *p_name; static gchar *p_name;
static void __playlist_set(GtkTreeIter *iter, const gchar *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, gtk_tree_store_set(p_store, iter, P_SB_NAME, name,
P_SB_IMAGE, image, P_SB_IMAGE, image, -1);
P_SB_PLAYLIST, plist, -1);
} }
static void __playlist_add(GtkTreeIter *parent, const gchar *name, static void __playlist_add(GtkTreeIter *parent, const gchar *name,
const gchar *image, enum playlist_t plist) const gchar *image)
{ {
GtkTreeIter iter; GtkTreeIter iter;
gtk_tree_store_insert(p_store, &iter, parent, -1); 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) void __playlist_selection_changed(GtkTreeSelection *selection, gpointer data)
@ -72,15 +70,14 @@ void gui_playlist_init()
/* Add "Playlist" header. */ /* Add "Playlist" header. */
gtk_tree_store_insert(p_store, &parent, NULL, -1); gtk_tree_store_insert(p_store, &parent, NULL, -1);
gtk_tree_store_insert(p_store, &parent, NULL, -1); gtk_tree_store_insert(p_store, &parent, NULL, -1);
__playlist_set(&parent, "<span size='large'>Playlists</span>", __playlist_set(&parent, "<big>Playlists</big>", "emblem-documents");
"emblem-documents", 0);
/* Add playlists. */ /* Add playlists. */
__playlist_add(&parent, "Favorites", "emblem-favorite", PL_FAVORITED); __playlist_add(&parent, "Favorites", "emblem-favorite");
__playlist_add(&parent, "Hidden", "window-close",PL_HIDDEN); __playlist_add(&parent, "Hidden", "face-sad");
__playlist_add(&parent, "Most Played", "go-up", PL_MOST_PLAYED); __playlist_add(&parent, "Most Played", "go-up");
__playlist_add(&parent, "Least Played", "go-down", PL_LEAST_PLAYED); __playlist_add(&parent, "Least Played", "go-down");
__playlist_add(&parent, "Unplayed", "audio-x-generic", PL_UNPLAYED); __playlist_add(&parent, "Unplayed", "audio-x-generic");
treeview = GTK_TREE_VIEW(gui_builder_widget("o_playlist_view")); treeview = GTK_TREE_VIEW(gui_builder_widget("o_playlist_view"));
gtk_tree_view_expand_all(treeview); gtk_tree_view_expand_all(treeview);

8
include/core/playlist.h
View File

@ -11,14 +11,6 @@
#include <core/containers/index.h> #include <core/containers/index.h>
#include <core/queue.h> #include <core/queue.h>
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. */ /* Called to initialize the playlist manager. */
void playlist_init(struct queue_ops *); void playlist_init(struct queue_ops *);

2
share/ocarina/ocarina6.glade
View File

@ -256,8 +256,6 @@
<column type="gchararray"/> <column type="gchararray"/>
<!-- column-name Name --> <!-- column-name Name -->
<column type="gchararray"/> <column type="gchararray"/>
<!-- column-name Playlist -->
<column type="guint"/>
</columns> </columns>
</object> </object>
<object class="GtkAdjustment" id="o_progress"> <object class="GtkAdjustment" id="o_progress">