From 1c437c4957acce24e3ad62fbdc7049ec39cbf4bf Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Wed, 10 Sep 2014 08:11:06 -0400
Subject: [PATCH] gui: Move init() steps into controls.cpp

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 gui/controls.cpp       | 15 +++++++++++++--
 gui/gui.cpp            |  6 +-----
 include/gui/controls.h |  4 ++--
 include/gui/ocarina.h  |  1 +
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/gui/controls.cpp b/gui/controls.cpp
index c0c055ff..9c12c463 100644
--- a/gui/controls.cpp
+++ b/gui/controls.cpp
@@ -4,6 +4,7 @@
 #include <lib/lib.h>
 #include <core/audio.h>
 #include <core/driver.h>
+#include <gui/ocarina.h>
 
 
 static inline bool audio_playing()
@@ -48,14 +49,14 @@ static void enable_timeout()
 }
 
 
-void o_play()
+static void o_play()
 {
 	audio :: play();
 	o_fix_buttons();
 	enable_timeout();
 }
 
-void o_pause()
+static void o_pause()
 {
 	audio :: pause();
 	o_fix_buttons();
@@ -74,3 +75,13 @@ void o_next()
 	audio :: next();
 	o_play();
 }
+
+
+void controls_init()
+{
+	connect_button("o_play", o_play);
+	connect_button("o_pause", o_pause);
+	connect_button("o_stop", audio::stop);
+	connect_button("o_prev", audio::prev);
+	connect_button("o_next", o_next);
+}
diff --git a/gui/gui.cpp b/gui/gui.cpp
index 5e35de5f..6af17beb 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -203,11 +203,7 @@ Gtk::Window *setup_gui()
 	cb->on_track_loaded = on_track_loaded;
 	cb->on_pause_count_changed = on_pause_count_changed;
 
-	connect_button("o_play", o_play);
-	connect_button("o_pause", o_pause);
-	connect_button("o_stop", audio::stop);
-	connect_button("o_prev", audio::prev);
-	connect_button("o_next", o_next);
+	controls_init();
 
 	count->signal_changed().connect(sigc::ptr_fun(on_config_pause));
 	enabled->signal_toggled().connect(sigc::ptr_fun(on_config_pause));
diff --git a/include/gui/controls.h b/include/gui/controls.h
index f56da851..0c0822a2 100644
--- a/include/gui/controls.h
+++ b/include/gui/controls.h
@@ -6,9 +6,9 @@
 
 void o_fix_buttons();
 
-void o_play();
-void o_pause();
 void o_toggle();
 void o_next();
 
+void controls_init();
+
 #endif /* OCARINA_GUI_CONTROLS_H */
diff --git a/include/gui/ocarina.h b/include/gui/ocarina.h
index 174926ca..2b07d968 100644
--- a/include/gui/ocarina.h
+++ b/include/gui/ocarina.h
@@ -4,6 +4,7 @@
 #ifndef OCARINA_H
 #define OCARINA_H
 
+#include <core/queue.h>
 #include <lib/lib.h>