gui/gst: Remove gst :: pre_init() and rename gst_init()
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
parent
dee8b948b0
commit
5368208a37
|
@ -11,6 +11,7 @@ extern "C" {
|
|||
#include <core/string.h>
|
||||
#include <gui/builder.h>
|
||||
}
|
||||
#include <gui/audio.h>
|
||||
#include <gui/ocarina.h>
|
||||
|
||||
|
||||
|
@ -111,7 +112,7 @@ static bool on_timeout()
|
|||
return true;
|
||||
}
|
||||
|
||||
void gst :: init_pre()
|
||||
void gui_audio_init()
|
||||
{
|
||||
o_seek = GTK_SCALE(gui_builder_widget("o_seek"));
|
||||
|
||||
|
@ -123,9 +124,6 @@ void gst :: init_pre()
|
|||
|
||||
g_signal_connect(o_count, "changed", G_CALLBACK(on_pause_count), NULL);
|
||||
g_signal_connect(o_enabled, "toggled", G_CALLBACK(on_pause_enabled), NULL);
|
||||
}
|
||||
|
||||
void gst :: init()
|
||||
{
|
||||
Glib :: signal_timeout().connect(sigc::ptr_fun(on_timeout), 500);
|
||||
}
|
||||
|
|
|
@ -7,6 +7,7 @@ extern "C" {
|
|||
#include <gui/settings.h>
|
||||
#include <gui/builder.h>
|
||||
}
|
||||
#include <gui/audio.h>
|
||||
#include <gui/ocarina.h>
|
||||
#include <gui/tabs.h>
|
||||
|
||||
|
@ -59,12 +60,11 @@ int main(int argc, char **argv)
|
|||
ocarina_app = Gtk::Application::create(argc, argv, "org.gtkmm.ocarina");
|
||||
|
||||
gui_builder_init(gui :: share_file("ocarina6.glade").c_str());
|
||||
gst :: init_pre();
|
||||
|
||||
core_init(&argc, &argv, &init_data);
|
||||
gui_settings_init();
|
||||
gui_audio_init();
|
||||
|
||||
gst :: init();
|
||||
plist :: init();
|
||||
manager :: init();
|
||||
init_tabs();
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
/*
|
||||
* Copyright 2016 (c) Anna Schumaker.
|
||||
*/
|
||||
#ifndef OCARINA_GUI_AUDIO_H
|
||||
#define OCARINA_GUI_AUDIO_H
|
||||
|
||||
/* Called to initialize the GUI audio controls. */
|
||||
void gui_audio_init();
|
||||
|
||||
#endif /* OCARINA_GUI_AUDIO_H */
|
|
@ -24,14 +24,6 @@ void on_pq_created(queue *, unsigned int);
|
|||
void post_init_queue_tabs();
|
||||
|
||||
|
||||
/* gst.cpp */
|
||||
namespace gst
|
||||
{
|
||||
void init_pre();
|
||||
void init();
|
||||
}
|
||||
|
||||
|
||||
/* manager.cpp */
|
||||
namespace manager
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue