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

gui: Put exported gst functions in a new namespace 

I intend to put most gui functions in their own namespaces eventually.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-01-17 09:59:25 -05:00
parent 452e5228af
commit b4db3ba98f
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gui/gst.cpp
View File

@ -160,12 +160,6 @@ static gboolean on_gst_message(GstBus *bus, GstMessage *message, gpointer data)
return TRUE; return TRUE;
} }
void on_next()
{
audio :: next();
audio :: play();
}
static bool on_seek(Gtk::ScrollType type, double value) static bool on_seek(Gtk::ScrollType type, double value)
{ {
audio :: seek_to(value); audio :: seek_to(value);
@ -190,7 +184,15 @@ static bool on_timeout()
return true; return true;
} }
void on_toggle()
void gst :: next()
{
audio :: next();
audio :: play();
}
void gst :: toggle()
{ {
if (gst_driver->is_playing()) if (gst_driver->is_playing())
audio :: pause(); audio :: pause();
@ -198,8 +200,7 @@ void on_toggle()
audio :: play(); audio :: play();
} }
void gst :: init(int *argc, char ***argv)
void init_gst(int *argc, char ***argv)
{ {
gst_init(argc, argv); gst_init(argc, argv);
@ -224,7 +225,7 @@ void init_gst(int *argc, char ***argv)
o_title = lib :: get_widget<Gtk::Label>("o_title"); o_title = lib :: get_widget<Gtk::Label>("o_title");
o_progress = lib :: get_object<Gtk::Adjustment>("o_progress"); o_progress = lib :: get_object<Gtk::Adjustment>("o_progress");
o_next->signal_clicked().connect(sigc::ptr_fun(on_next)); o_next->signal_clicked().connect(sigc::ptr_fun(next));
o_pause->signal_clicked().connect(sigc::ptr_fun(audio :: pause)); o_pause->signal_clicked().connect(sigc::ptr_fun(audio :: pause));
o_play->signal_clicked().connect(sigc::ptr_fun(audio :: play)); o_play->signal_clicked().connect(sigc::ptr_fun(audio :: play));
o_prev->signal_clicked().connect(sigc::ptr_fun(audio :: prev)); o_prev->signal_clicked().connect(sigc::ptr_fun(audio :: prev));
@ -238,7 +239,7 @@ void init_gst(int *argc, char ***argv)
lib :: schedule(on_timeout, 500); lib :: schedule(on_timeout, 500);
} }
void quit_gst() void gst :: quit()
{ {
delete gst_driver; delete gst_driver;
gst_change_state(GST_STATE_NULL); gst_change_state(GST_STATE_NULL);

4
gui/main.cpp
View File

@ -18,7 +18,7 @@ Gtk::Window *ocarina_init(int *argc, char ***argv)
lib :: init(argc, argv, "ocarina6.glade"); lib :: init(argc, argv, "ocarina6.glade");
init_gst(argc, argv); gst :: init(argc, argv);
init_playlist_tab(); init_playlist_tab();
core :: init(); core :: init();
@ -38,7 +38,7 @@ int main(int argc, char **argv)
Gtk::Window *window = ocarina_init(&argc, &argv); Gtk::Window *window = ocarina_init(&argc, &argv);
ocarina->run(*window); ocarina->run(*window);
cleanup_tabs(); cleanup_tabs();
quit_gst(); gst :: quit();
return 0; return 0;
} }
#endif /* CONFIG_TEST */ #endif /* CONFIG_TEST */

4
gui/window.cpp
View File

@ -35,7 +35,7 @@ static bool on_window_key_pressed(GdkEventKey *event)
else if (key == "m") else if (key == "m")
notebook->set_current_page(deck::get_queues().size() + 3); notebook->set_current_page(deck::get_queues().size() + 3);
else if (key == "n") else if (key == "n")
on_next(); gst :: next();
else if (key == "N") else if (key == "N")
audio :: prev(); audio :: prev();
else if (key == "p") else if (key == "p")
@ -52,7 +52,7 @@ static bool on_window_key_released(GdkEventKey *event)
if (key != "space") if (key != "space")
return false; return false;
on_toggle(); gst :: toggle();
return true; return true;
} }

11
include/gui/ocarina.h
View File

@ -23,10 +23,13 @@ void post_init_queue_tabs();
/* gst.cpp */ /* gst.cpp */
void on_next(); namespace gst
void on_toggle(); {
void init_gst(int *, char ***); void next();
void quit_gst(); void toggle();
void init(int *, char ***);
void quit();
}
/* window.cpp */ /* window.cpp */