ocarina: Changes for the TrackTag() class removal

This commit is contained in:
Bryan Schumaker 2011-12-26 12:14:35 -05:00
parent a74cea2e71
commit 6eaa8f944c
10 changed files with 22 additions and 22 deletions

View File

@ -6,6 +6,6 @@
GtkWidget *get_footer();
void put_footer();
void change_footer(Track &);
void change_footer(libsaria::Track *);
#endif /* OCARINA_FOOTER */

View File

@ -11,7 +11,7 @@ namespace ocarina
void init();
void refresh();
void refilter();
void scroll_to(Track &);
void scroll_to(libsaria::Track *);
}
};

View File

@ -58,12 +58,12 @@ class SongList : public libsaria::SourceModel
GtkWidget *get_window();
GtkWidget *get_label();
void insert(Track &);
void insert(libsaria::Track *);
void fill();
void clear();
void refilter();
void list_selected_ids(list<sid_t> &);
void scroll_to(Track &);
void scroll_to(libsaria::Track *);
gint right_click(guint, guint64);
};

View File

@ -48,7 +48,7 @@ void cb_refilter()
ocarina::library::refilter();
}
void cb_track_loaded_helper(Track &track)
void cb_track_loaded_helper(libsaria::Track *track)
{
change_footer(track);
ocarina::library::scroll_to(track);

View File

@ -37,7 +37,7 @@ void put_footer()
g_object_unref(footer);
}
void change_footer(Track &track)
void change_footer(libsaria::Track *track)
{
set_now_playing(track);
}

View File

@ -7,6 +7,6 @@ GtkWidget *get_controls();
GtkWidget *get_nowplaying();
GtkWidget *get_progress();
void set_now_playing(Track &);
void set_now_playing(libsaria::Track *);
#endif /* OCARINA_FOOTER_PRIVATE_H */

View File

@ -79,9 +79,9 @@ GtkWidget *get_nowplaying()
return now_playing;
}
void set_now_playing(Track &track)
void set_now_playing(libsaria::Track *track)
{
set_title(track.get_title());
set_artist("by " + track.get_artist());
set_album("from " + track.get_album());
set_title(track->get_title());
set_artist("by " + track->get_artist());
set_album("from " + track->get_album());
}

View File

@ -57,7 +57,7 @@ namespace ocarina
ocarina::library::refresh();
}
void library::scroll_to(Track &track)
void library::scroll_to(libsaria::Track *track)
{
library_list.scroll_to(track);
}

View File

@ -20,16 +20,16 @@ void SongList::clear()
thaw();
}
void SongList::insert(Track &track)
void SongList::insert(libsaria::Track *track)
{
gtk_list_store_insert_with_values(liststore, NULL, ins_next,
0, track.get_songid(),
1, track.get_track(),
2, track.get_title().c_str(),
3, track.get_lenstr().c_str(),
4, track.get_artist().c_str(),
5, track.get_album().c_str(),
6, track.get_year(),
0, track->get_songid(),
1, track->get_track(),
2, track->get_title().c_str(),
3, track->get_lenstr().c_str(),
4, track->get_artist().c_str(),
5, track->get_album().c_str(),
6, track->get_year(),
-1);
ins_next++;
}

View File

@ -103,10 +103,10 @@ static int scroll_to_check_row(GtkTreeModel *model, GtkTreePath *path,
return TRUE;
}
void SongList::scroll_to(Track &track)
void SongList::scroll_to(libsaria::Track *track)
{
struct scroll_data data;
data.inode = track.get_songid();
data.inode = track->get_songid();
data.treeview = treeview;
gtk_tree_view_get_visible_rect(GTK_TREE_VIEW(treeview), &data.rect);