ocarina: Update to new libsaria namespace
The old functions are no longer defined, so this patch updates to the new functions.
This commit is contained in:
parent
cea236a757
commit
1996b54065
|
@ -62,7 +62,7 @@ static void on_click_open_file(GtkWidget *b, GdkEvent *e, gpointer d)
|
|||
string file = ocarina_choose_file();
|
||||
if (file != "") {
|
||||
println("Playing file: " + file);
|
||||
libsaria_load(file);
|
||||
libsaria::load(file);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ void hide_button_list(button_list_t bttn_list)
|
|||
|
||||
static void on_click_play(GtkWidget *b, GdkEvent *e, gpointer d)
|
||||
{
|
||||
libsaria_play();
|
||||
libsaria::play();
|
||||
}
|
||||
|
||||
GtkWidget *make_play_button()
|
||||
|
@ -51,7 +51,7 @@ GtkWidget *make_play_button()
|
|||
|
||||
static void on_click_pause(GtkWidget *b, GdkEvent *e, gpointer d)
|
||||
{
|
||||
libsaria_pause();
|
||||
libsaria::pause();
|
||||
}
|
||||
|
||||
GtkWidget *make_pause_button()
|
||||
|
@ -65,7 +65,7 @@ GtkWidget *make_pause_button()
|
|||
|
||||
static void on_click_stop(GtkWidget *b, GdkEvent *e, gpointer d)
|
||||
{
|
||||
libsaria_stop();
|
||||
libsaria::stop();
|
||||
}
|
||||
|
||||
GtkWidget *make_stop_button()
|
||||
|
@ -77,7 +77,7 @@ GtkWidget *make_stop_button()
|
|||
|
||||
static void on_click_rewind(GtkWidget *b, GdkEvent *e, gpointer d)
|
||||
{
|
||||
libsaria_seek(-5);
|
||||
libsaria::seek(-5);
|
||||
}
|
||||
|
||||
GtkWidget *make_rewind_button()
|
||||
|
@ -89,7 +89,7 @@ GtkWidget *make_rewind_button()
|
|||
|
||||
static void on_click_forward(GtkWidget *b, GdkEvent *e, gpointer d)
|
||||
{
|
||||
libsaria_seek(5);
|
||||
libsaria::seek(5);
|
||||
}
|
||||
|
||||
GtkWidget *make_forward_button()
|
||||
|
|
|
@ -24,7 +24,7 @@ static void set_increment(GtkWidget *volume, double incr)
|
|||
|
||||
static void changed(GtkWidget *button, gdouble value, gpointer data)
|
||||
{
|
||||
libsaria_set_volume(value);
|
||||
libsaria::set_volume(value);
|
||||
resize(button);
|
||||
}
|
||||
|
||||
|
@ -32,7 +32,7 @@ GtkWidget *make_volume_button()
|
|||
{
|
||||
GtkWidget *volume = gtk_volume_button_new();
|
||||
gtk_scale_button_set_value(GTK_SCALE_BUTTON(volume),
|
||||
libsaria_get_volume());
|
||||
libsaria::get_volume());
|
||||
gtk_widget_show(volume);
|
||||
set_increment(volume, 0.05);
|
||||
resize(volume);
|
||||
|
|
|
@ -24,7 +24,7 @@ void library_init()
|
|||
static void fill_library()
|
||||
{
|
||||
list<Track> track_list;
|
||||
libsaria_library_list(track_list);
|
||||
libsaria::library_list(track_list);
|
||||
print("track list size: ");
|
||||
println(track_list.size());
|
||||
library_list.insert(track_list);
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
static gboolean ocarina_idle(gpointer data)
|
||||
{
|
||||
if (libsaria_idle_task() == 0)
|
||||
if (libsaria::idle_task() == 0)
|
||||
return FALSE; /* There are no idle events left */
|
||||
return TRUE; /* Process remaining idle events */
|
||||
}
|
||||
|
@ -51,15 +51,15 @@ int main(int argc, char **argv)
|
|||
{
|
||||
println("Ocarina " + vers_str());
|
||||
|
||||
libsaria_init(argc, argv);
|
||||
libsaria::init(argc, argv);
|
||||
setup_callbacks();
|
||||
gtk_init(&argc, &argv);
|
||||
ocarina_init(argc, argv);
|
||||
|
||||
if (argc > 1)
|
||||
libsaria_load(argv[1]);
|
||||
libsaria::load(argv[1]);
|
||||
|
||||
gtk_main();
|
||||
libsaria_quit();
|
||||
libsaria::quit();
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@ static void on_click_add(GtkWidget *b, GdkEvent *e, gpointer d)
|
|||
string dir = ocarina_choose_dir();
|
||||
if (dir != "" ) {
|
||||
println("Scanning dir: " + dir);
|
||||
libsaria_add_library(dir);
|
||||
libsaria::add_library(dir);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ static void songlist_row_activated(GtkTreeView *treeview, GtkTreePath *path,
|
|||
gtk_tree_model_get(model, &iter, 0, &inode, -1);
|
||||
print("Double click! ");
|
||||
println(inode);
|
||||
libsaria_play_id(inode);
|
||||
libsaria::play_id(inode);
|
||||
}
|
||||
|
||||
void SongList::add_column(unsigned int index)
|
||||
|
|
Loading…
Reference in New Issue