ocarina: Remove references to ino_t
sid_t is more obvious that it's a song id.
This commit is contained in:
parent
5f20899b14
commit
11e3d77dca
|
@ -62,7 +62,7 @@ class SongList : public libsaria::SourceModel
|
|||
void fill();
|
||||
void clear();
|
||||
void refilter();
|
||||
void list_selected_ids(list<ino_t> &);
|
||||
void list_selected_ids(list<sid_t> &);
|
||||
void scroll_to(Track &);
|
||||
|
||||
gint right_click(guint, guint64);
|
||||
|
|
|
@ -19,8 +19,8 @@ static list <MenuItem> library_menu;
|
|||
|
||||
static void add_to_queue()
|
||||
{
|
||||
list<ino_t> selected;
|
||||
list<ino_t>::iterator it;
|
||||
list<sid_t> selected;
|
||||
list<sid_t>::iterator it;
|
||||
library_list.list_selected_ids(selected);
|
||||
libsaria::queue::add_ids(selected);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
gboolean songlist_filter_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
|
||||
{
|
||||
ino_t inode;
|
||||
sid_t inode;
|
||||
gtk_tree_model_get(model, iter, 0, &inode, -1);
|
||||
return libsaria::library::is_visible(inode);
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@ using namespace std;
|
|||
#include <libsaria/print.h>
|
||||
#include "songlist.h"
|
||||
|
||||
void songlist_selected_inode(GtkTreeView *treeview, GtkTreePath *path, ino_t &inode)
|
||||
void songlist_selected_inode(GtkTreeView *treeview, GtkTreePath *path, sid_t &inode)
|
||||
{
|
||||
GtkTreeIter iter;
|
||||
GtkTreeModel *model = gtk_tree_view_get_model(treeview);
|
||||
|
@ -22,7 +22,7 @@ void songlist_row_activated(GtkTreeView *treeview, GtkTreePath *path,
|
|||
GtkTreeViewColumn *column, gpointer data)
|
||||
{
|
||||
GtkTreeIter iter;
|
||||
ino_t inode;
|
||||
sid_t inode;
|
||||
GtkTreeModel *model = gtk_tree_view_get_model(treeview);
|
||||
gtk_tree_model_get_iter(model, &iter, path);
|
||||
gtk_tree_model_get(model, &iter, 0, &inode, -1);
|
||||
|
@ -33,13 +33,13 @@ void songlist_row_activated(GtkTreeView *treeview, GtkTreePath *path,
|
|||
static void selected_foreach_func(GtkTreeModel *model, GtkTreePath *path,
|
||||
GtkTreeIter *iter, gpointer data)
|
||||
{
|
||||
list<ino_t> *res = (list<ino_t> *) data;
|
||||
ino_t inode;
|
||||
list<sid_t> *res = (list<sid_t> *) data;
|
||||
sid_t inode;
|
||||
gtk_tree_model_get(model, iter, 0, &inode, -1);
|
||||
res->push_back(inode);
|
||||
}
|
||||
|
||||
void SongList::list_selected_ids(list<ino_t> &res)
|
||||
void SongList::list_selected_ids(list<sid_t> &res)
|
||||
{
|
||||
gtk_tree_selection_selected_foreach(selection, selected_foreach_func, &res);
|
||||
}
|
||||
|
@ -67,7 +67,7 @@ void SongList::set_label_text()
|
|||
}
|
||||
|
||||
struct scroll_data {
|
||||
ino_t inode;
|
||||
sid_t inode;
|
||||
GtkWidget *treeview;
|
||||
GdkRectangle rect;
|
||||
};
|
||||
|
@ -76,7 +76,7 @@ static int scroll_to_check_row(GtkTreeModel *model, GtkTreePath *path,
|
|||
GtkTreeIter *iter, gpointer data)
|
||||
{
|
||||
struct scroll_data *scroll = (struct scroll_data *)data;
|
||||
ino_t current;
|
||||
sid_t current;
|
||||
GtkTreeViewColumn *col;
|
||||
GtkTreePath *target;
|
||||
GdkRectangle area;
|
||||
|
|
Loading…
Reference in New Issue