aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-09-27 22:56:30 +0200
committerMax Kellermann <max@duempel.org>2013-09-27 23:00:23 +0200
commitccd7f0825acb031259330d32c54e61fc7f9ba7b1 (patch)
tree315f4d8e4dc2cae5e7bc07efce5fb414a4a8e502 /src
parentd0896ea7c4bf7708ea24c7beb81b16776b446a6e (diff)
downloadmpd-ccd7f0825acb031259330d32c54e61fc7f9ba7b1.tar.gz
mpd-ccd7f0825acb031259330d32c54e61fc7f9ba7b1.tar.xz
mpd-ccd7f0825acb031259330d32c54e61fc7f9ba7b1.zip
DecoderControl: use GLib forward declarations
Diffstat (limited to '')
-rw-r--r--src/ClientRead.cxx2
-rw-r--r--src/DecoderControl.cxx2
-rw-r--r--src/DecoderControl.hxx3
-rw-r--r--src/Main.hxx3
-rw-r--r--src/OutputControl.cxx2
-rw-r--r--src/OutputInternal.hxx4
-rw-r--r--src/output/HttpdInternal.hxx2
-rw-r--r--src/output/PipeOutputPlugin.cxx2
-rw-r--r--src/output/WinmmOutputPlugin.cxx2
9 files changed, 16 insertions, 6 deletions
diff --git a/src/ClientRead.cxx b/src/ClientRead.cxx
index 49c698bc1..8f7c4cf7e 100644
--- a/src/ClientRead.cxx
+++ b/src/ClientRead.cxx
@@ -22,6 +22,8 @@
#include "Main.hxx"
#include "event/Loop.hxx"
+#include <glib.h>
+
#include <assert.h>
#include <string.h>
diff --git a/src/DecoderControl.cxx b/src/DecoderControl.cxx
index 483d9203b..191a6e363 100644
--- a/src/DecoderControl.cxx
+++ b/src/DecoderControl.cxx
@@ -22,6 +22,8 @@
#include "MusicPipe.hxx"
#include "Song.hxx"
+#include <glib.h>
+
#include <assert.h>
#undef G_LOG_DOMAIN
diff --git a/src/DecoderControl.hxx b/src/DecoderControl.hxx
index 3885305a7..a787242e1 100644
--- a/src/DecoderControl.hxx
+++ b/src/DecoderControl.hxx
@@ -26,8 +26,6 @@
#include "thread/Cond.hxx"
#include "util/Error.hxx"
-#include <glib.h>
-
#include <assert.h>
#include <stdint.h>
@@ -39,6 +37,7 @@
struct Song;
class MusicBuffer;
class MusicPipe;
+typedef struct _GThread GThread;
enum class DecoderState : uint8_t {
STOP = 0,
diff --git a/src/Main.hxx b/src/Main.hxx
index e403d5669..a789300ed 100644
--- a/src/Main.hxx
+++ b/src/Main.hxx
@@ -20,10 +20,9 @@
#ifndef MPD_MAIN_HXX
#define MPD_MAIN_HXX
-#include <glib.h>
-
class EventLoop;
struct Instance;
+typedef struct _GThread GThread;
extern GThread *main_task;
diff --git a/src/OutputControl.cxx b/src/OutputControl.cxx
index 2b372c5b7..a0fd99701 100644
--- a/src/OutputControl.cxx
+++ b/src/OutputControl.cxx
@@ -29,6 +29,8 @@
#include "FilterPlugin.hxx"
#include "util/Error.hxx"
+#include <glib.h>
+
#include <assert.h>
#include <stdlib.h>
diff --git a/src/OutputInternal.hxx b/src/OutputInternal.hxx
index fac25aa3c..7e615290e 100644
--- a/src/OutputInternal.hxx
+++ b/src/OutputInternal.hxx
@@ -25,14 +25,14 @@
#include "thread/Mutex.hxx"
#include "thread/Cond.hxx"
-#include <glib.h>
-
#include <time.h>
class Error;
class Filter;
class MusicPipe;
struct config_param;
+typedef struct _GThread GThread;
+typedef struct _GTimer GTimer;
enum audio_output_command {
AO_COMMAND_NONE = 0,
diff --git a/src/output/HttpdInternal.hxx b/src/output/HttpdInternal.hxx
index 39fc700a3..925116b61 100644
--- a/src/output/HttpdInternal.hxx
+++ b/src/output/HttpdInternal.hxx
@@ -30,6 +30,8 @@
#include "thread/Mutex.hxx"
#include "event/ServerSocket.hxx"
+#include <glib.h>
+
#include <forward_list>
struct config_param;
diff --git a/src/output/PipeOutputPlugin.cxx b/src/output/PipeOutputPlugin.cxx
index ca8f398da..2b830ef29 100644
--- a/src/output/PipeOutputPlugin.cxx
+++ b/src/output/PipeOutputPlugin.cxx
@@ -24,6 +24,8 @@
#include "util/Error.hxx"
#include "util/Domain.hxx"
+#include <glib.h>
+
#include <stdio.h>
#include <errno.h>
diff --git a/src/output/WinmmOutputPlugin.cxx b/src/output/WinmmOutputPlugin.cxx
index 7d81576e8..e8b3c3a3a 100644
--- a/src/output/WinmmOutputPlugin.cxx
+++ b/src/output/WinmmOutputPlugin.cxx
@@ -25,6 +25,8 @@
#include "util/Error.hxx"
#include "util/Domain.hxx"
+#include <glib.h>
+
#include <stdlib.h>
#include <string.h>