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

queue: Fix compile errors related to recent changes 

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2014-05-11 09:20:24 -04:00
parent 3fbb4d9735
commit 24fe8e7ee2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/model.cpp
View File

@ -69,7 +69,7 @@ unsigned int QueueModel :: iter_to_id(const Gtk::TreeIter &iter)
unsigned int QueueModel::path_to_id(const Gtk::TreePath &path) unsigned int QueueModel::path_to_id(const Gtk::TreePath &path)
{ {
return queue->operator[](path[0]); return queue->operator[](path[0])->id;
} }
@ -186,7 +186,7 @@ void QueueModel::get_value_vfunc(const Gtk::TreeIter &iter, int column,
return; return;
row = GPOINTER_TO_UINT(iter.gobj()->user_data); row = GPOINTER_TO_UINT(iter.gobj()->user_data);
track = tagdb :: lookup((*queue)[row]); track = queue->operator[](row);
switch (column) { switch (column) {
case 0: case 0:

2
gui/queue.cpp
View File

@ -218,7 +218,7 @@ void QueueTab :: on_post_init()
tab_init_random(); tab_init_random();
tab_init_repeat(); tab_init_repeat();
bool active = (tab_pq->get_flags() & Q_ENABLED) == Q_ENABLED; bool active = (tab_pq->has_flag(Q_ENABLED));
q_switch.set_active(active); q_switch.set_active(active);
q_switch.property_active().signal_changed().connect( q_switch.property_active().signal_changed().connect(
sigc::mem_fun(*this, &QueueTab :: on_switch_changed)); sigc::mem_fun(*this, &QueueTab :: on_switch_changed));

8
gui/tabs.cpp
View File

@ -71,14 +71,14 @@ void Tab :: tab_finish_init()
void Tab :: tab_init_random() void Tab :: tab_init_random()
{ {
tab_random->set_active(tab_pq->get_flags() & Q_RANDOM); tab_random->set_active(tab_pq->has_flag(Q_RANDOM));
tab_random->signal_toggled().connect(sigc::mem_fun(*this, tab_random->signal_toggled().connect(sigc::mem_fun(*this,
&Tab::on_random_toggled)); &Tab::on_random_toggled));
} }
void Tab :: tab_init_repeat() void Tab :: tab_init_repeat()
{ {
tab_repeat->set_active(tab_pq->get_flags() & Q_REPEAT); tab_repeat->set_active(tab_pq->has_flag(Q_REPEAT));
tab_repeat->signal_toggled().connect(sigc::mem_fun(*this, tab_repeat->signal_toggled().connect(sigc::mem_fun(*this,
&Tab::on_repeat_toggled)); &Tab::on_repeat_toggled));
} }
@ -355,7 +355,7 @@ bool Tab :: on_filter_visible(const Gtk::TreeIter &iter)
return true; return true;
pq_id = tab_model->iter_to_id(iter); pq_id = tab_model->iter_to_id(iter);
it = visible_ids.find(tab_pq->operator[](pq_id)); it = visible_ids.find(tab_pq->operator[](pq_id)->id);
return it != visible_ids.end(); return it != visible_ids.end();
} }
@ -522,7 +522,7 @@ void post_init_tabs()
unsigned int tab = 0; unsigned int tab = 0;
for (tab = 0; tab < deck::size(); tab++) { for (tab = 0; tab < deck::size(); tab++) {
if ((deck :: get(tab)->get_flags() & Q_ENABLED) == Q_ENABLED) if ((deck :: get(tab)->has_flag(Q_ENABLED)))
break; break;
} }
get_widget<Gtk::Notebook>("o_notebook")->set_current_page(tab); get_widget<Gtk::Notebook>("o_notebook")->set_current_page(tab);