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:
parent
452e5228af
commit
b4db3ba98f
23
gui/gst.cpp
23
gui/gst.cpp
|
@ -160,12 +160,6 @@ static gboolean on_gst_message(GstBus *bus, GstMessage *message, gpointer data)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
void on_next()
|
||||
{
|
||||
audio :: next();
|
||||
audio :: play();
|
||||
}
|
||||
|
||||
static bool on_seek(Gtk::ScrollType type, double value)
|
||||
{
|
||||
audio :: seek_to(value);
|
||||
|
@ -190,7 +184,15 @@ static bool on_timeout()
|
|||
return true;
|
||||
}
|
||||
|
||||
void on_toggle()
|
||||
|
||||
|
||||
void gst :: next()
|
||||
{
|
||||
audio :: next();
|
||||
audio :: play();
|
||||
}
|
||||
|
||||
void gst :: toggle()
|
||||
{
|
||||
if (gst_driver->is_playing())
|
||||
audio :: pause();
|
||||
|
@ -198,8 +200,7 @@ void on_toggle()
|
|||
audio :: play();
|
||||
}
|
||||
|
||||
|
||||
void init_gst(int *argc, char ***argv)
|
||||
void gst :: init(int *argc, char ***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_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_play->signal_clicked().connect(sigc::ptr_fun(audio :: play));
|
||||
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);
|
||||
}
|
||||
|
||||
void quit_gst()
|
||||
void gst :: quit()
|
||||
{
|
||||
delete gst_driver;
|
||||
gst_change_state(GST_STATE_NULL);
|
||||
|
|
|
@ -18,7 +18,7 @@ Gtk::Window *ocarina_init(int *argc, char ***argv)
|
|||
|
||||
lib :: init(argc, argv, "ocarina6.glade");
|
||||
|
||||
init_gst(argc, argv);
|
||||
gst :: init(argc, argv);
|
||||
init_playlist_tab();
|
||||
|
||||
core :: init();
|
||||
|
@ -38,7 +38,7 @@ int main(int argc, char **argv)
|
|||
Gtk::Window *window = ocarina_init(&argc, &argv);
|
||||
ocarina->run(*window);
|
||||
cleanup_tabs();
|
||||
quit_gst();
|
||||
gst :: quit();
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_TEST */
|
||||
|
|
|
@ -35,7 +35,7 @@ static bool on_window_key_pressed(GdkEventKey *event)
|
|||
else if (key == "m")
|
||||
notebook->set_current_page(deck::get_queues().size() + 3);
|
||||
else if (key == "n")
|
||||
on_next();
|
||||
gst :: next();
|
||||
else if (key == "N")
|
||||
audio :: prev();
|
||||
else if (key == "p")
|
||||
|
@ -52,7 +52,7 @@ static bool on_window_key_released(GdkEventKey *event)
|
|||
if (key != "space")
|
||||
return false;
|
||||
|
||||
on_toggle();
|
||||
gst :: toggle();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -23,10 +23,13 @@ void post_init_queue_tabs();
|
|||
|
||||
|
||||
/* gst.cpp */
|
||||
void on_next();
|
||||
void on_toggle();
|
||||
void init_gst(int *, char ***);
|
||||
void quit_gst();
|
||||
namespace gst
|
||||
{
|
||||
void next();
|
||||
void toggle();
|
||||
void init(int *, char ***);
|
||||
void quit();
|
||||
}
|
||||
|
||||
|
||||
/* window.cpp */
|
||||
|
|
Loading…
Reference in New Issue