From 50a7c83d61ad4cd1a4188e0889b9f9b07cfeb5e8 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Thu, 24 Dec 2015 13:05:20 -0500
Subject: [PATCH] gui/audio: Convert gst.cpp to audio.c

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 gui/{gst.cpp => audio.c} | 11 ++---------
 gui/ocarina.cpp          |  6 +++---
 include/core/audio.h     |  4 ++++
 include/gui/audio.h      |  3 +++
 include/gui/ocarina.h    |  1 -
 5 files changed, 12 insertions(+), 13 deletions(-)
 rename gui/{gst.cpp => audio.c} (92%)

diff --git a/gui/gst.cpp b/gui/audio.c
similarity index 92%
rename from gui/gst.cpp
rename to gui/audio.c
index bfeaa538..2296cb8d 100644
--- a/gui/gst.cpp
+++ b/gui/audio.c
@@ -1,18 +1,11 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
- *
- * The gst_init() function parses command line options passed to Ocarina
- * through argv.  Use the command `gst-inspect-1.0 --help-gst` to find
- * what options are supported.
  */
-extern "C" {
 #include <core/audio.h>
 #include <core/playlist.h>
 #include <core/string.h>
-#include <gui/builder.h>
-}
 #include <gui/audio.h>
-#include <gui/ocarina.h>
+#include <gui/builder.h>
 
 
 static GtkScale  *o_seek;
@@ -84,7 +77,7 @@ struct audio_ops audio_ops = {
 };
 
 
-static bool on_seek(Gtk::ScrollType type, double value)
+static bool on_seek(GtkScrollType type, double value)
 {
 	audio_seek(value);
 	return true;
diff --git a/gui/ocarina.cpp b/gui/ocarina.cpp
index 35f59c7f..b5557d99 100644
--- a/gui/ocarina.cpp
+++ b/gui/ocarina.cpp
@@ -4,10 +4,10 @@
 extern "C" {
 #include <core/core.h>
 #include <core/idle.h>
-#include <gui/settings.h>
-#include <gui/builder.h>
-}
 #include <gui/audio.h>
+#include <gui/builder.h>
+#include <gui/settings.h>
+}
 #include <gui/ocarina.h>
 #include <gui/tabs.h>
 
diff --git a/include/core/audio.h b/include/core/audio.h
index 7d10c583..3d005462 100644
--- a/include/core/audio.h
+++ b/include/core/audio.h
@@ -1,5 +1,9 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
+ *
+ * The gst_init() function parses command line options passed to Ocarina
+ * through argv.  Use the command `gst-inspect-1.0 --help-gst` to find
+ * what options are supported.
  */
 #ifndef OCARINA_CORE_AUDIO_H
 #define OCARINA_CORE_AUDIO_H
diff --git a/include/gui/audio.h b/include/gui/audio.h
index 0960a7b1..44e3f2d4 100644
--- a/include/gui/audio.h
+++ b/include/gui/audio.h
@@ -4,6 +4,9 @@
 #ifndef OCARINA_GUI_AUDIO_H
 #define OCARINA_GUI_AUDIO_H
 
+/* Audio callback functions. */
+extern struct audio_ops audio_ops;
+
 /* Called to initialize the GUI audio controls. */
 void gui_audio_init();
 
diff --git a/include/gui/ocarina.h b/include/gui/ocarina.h
index f0a07e43..dee417d2 100644
--- a/include/gui/ocarina.h
+++ b/include/gui/ocarina.h
@@ -18,7 +18,6 @@ extern struct queue_ops collection_ops;
 extern struct queue_ops history_ops;
 extern struct queue_ops playlist_ops;
 extern struct queue_ops tempq_ops;
-extern struct audio_ops audio_ops;
 
 void on_pq_created(queue *, unsigned int);
 void post_init_queue_tabs();