From 0726b71ceb6edc21b85dda493cf7779fbae6168a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Wed, 12 Dec 2012 17:35:04 +0000
Subject: [PATCH] ext/sys: Fix some compilation errors caused by circular
 includes

---
 ext/jack/gstjack.c          | 1 +
 ext/jack/gstjack.h          | 2 ++
 ext/jack/gstjackaudiosink.c | 1 +
 ext/jack/gstjackaudiosrc.c  | 2 ++
 ext/jack/gstjackutil.h      | 2 +-
 ext/libpng/gstpngenc.c      | 3 ++-
 ext/pulse/pulseprobe.c      | 2 ++
 ext/pulse/pulsesink.c       | 3 +--
 ext/pulse/pulsesink.h       | 1 +
 ext/pulse/pulsesrc.c        | 2 +-
 ext/pulse/pulseutil.c       | 2 ++
 ext/vpx/gstvp8enc.c         | 3 +--
 sys/oss/common.h            | 2 ++
 sys/oss/gstossaudio.c       | 1 +
 sys/oss/gstosssrc.c         | 2 +-
 sys/oss4/oss4-audio.h       | 2 +-
 16 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
index a6ddf3fda3..ca98dc4059 100644
--- a/ext/jack/gstjack.c
+++ b/ext/jack/gstjack.c
@@ -21,6 +21,7 @@
 #include "config.h"
 #endif
 
+#include "gstjack.h"
 #include "gstjackaudiosrc.h"
 #include "gstjackaudiosink.h"
 
diff --git a/ext/jack/gstjack.h b/ext/jack/gstjack.h
index deeb36db3b..15b040e8ab 100644
--- a/ext/jack/gstjack.h
+++ b/ext/jack/gstjack.h
@@ -22,6 +22,8 @@
 #ifndef _GST_JACK_H_
 #define _GST_JACK_H_
 
+#include <jack/jack.h>
+#include <gst/audio/audio.h>
 
 /**
  * GstJackConnect:
diff --git a/ext/jack/gstjackaudiosink.c b/ext/jack/gstjackaudiosink.c
index 62ee2a8877..e33ed18139 100644
--- a/ext/jack/gstjackaudiosink.c
+++ b/ext/jack/gstjackaudiosink.c
@@ -62,6 +62,7 @@
 #include <gst/gst-i18n-plugin.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gst/audio/audio.h>
 
 #include "gstjackaudiosink.h"
 #include "gstjackringbuffer.h"
diff --git a/ext/jack/gstjackaudiosrc.c b/ext/jack/gstjackaudiosrc.c
index 5582625fc6..eb5951a896 100644
--- a/ext/jack/gstjackaudiosrc.c
+++ b/ext/jack/gstjackaudiosrc.c
@@ -82,6 +82,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <gst/audio/audio.h>
+
 #include "gstjackaudiosrc.h"
 #include "gstjackringbuffer.h"
 #include "gstjackutil.h"
diff --git a/ext/jack/gstjackutil.h b/ext/jack/gstjackutil.h
index af173d5906..7a4bcc500d 100644
--- a/ext/jack/gstjackutil.h
+++ b/ext/jack/gstjackutil.h
@@ -23,7 +23,7 @@
 #define _GST_JACK_UTIL_H_
 
 #include <gst/gst.h>
-#include <gst/audio/gstaudioringbuffer.h>
+#include <gst/audio/audio.h>
 
 void
 gst_jack_set_layout (GstAudioRingBuffer * buffer, GstAudioRingBufferSpec *spec);
diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c
index 7d0ba4d453..7da1fafe77 100644
--- a/ext/libpng/gstpngenc.c
+++ b/ext/libpng/gstpngenc.c
@@ -29,11 +29,12 @@
 #endif
 #include <string.h>
 #include <gst/gst.h>
-#include "gstpngenc.h"
 #include <gst/video/video.h>
 #include <gst/video/gstvideometa.h>
 #include <zlib.h>
 
+#include "gstpngenc.h"
+
 GST_DEBUG_CATEGORY_STATIC (pngenc_debug);
 #define GST_CAT_DEFAULT pngenc_debug
 
diff --git a/ext/pulse/pulseprobe.c b/ext/pulse/pulseprobe.c
index 03d89a0455..3496394c7c 100644
--- a/ext/pulse/pulseprobe.c
+++ b/ext/pulse/pulseprobe.c
@@ -29,6 +29,8 @@
 #include "config.h"
 #endif
 
+#include <gst/audio/audio.h>
+
 #include "pulseprobe.h"
 #include "pulseutil.h"
 
diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
index 41e8f6dbd8..e6f95a3d3c 100644
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@ -52,9 +52,8 @@
 
 #include <gst/base/gstbasesink.h>
 #include <gst/gsttaglist.h>
-#include <gst/audio/streamvolume.h>
+#include <gst/audio/audio.h>
 #include <gst/gst-i18n-plugin.h>
-#include <gst/audio/gstaudioiec61937.h>
 
 #include <gst/pbutils/pbutils.h>        /* only used for GST_PLUGINS_BASE_VERSION_* */
 
diff --git a/ext/pulse/pulsesink.h b/ext/pulse/pulsesink.h
index 186d607283..f2ccd3933c 100644
--- a/ext/pulse/pulsesink.h
+++ b/ext/pulse/pulsesink.h
@@ -29,6 +29,7 @@
 #endif
 
 #include <gst/gst.h>
+#include <gst/audio/audio.h>
 #include <gst/audio/gstaudiosink.h>
 
 #include <pulse/pulseaudio.h>
diff --git a/ext/pulse/pulsesrc.c b/ext/pulse/pulsesrc.c
index f3c55bdb05..02f64884a0 100644
--- a/ext/pulse/pulsesrc.c
+++ b/ext/pulse/pulsesrc.c
@@ -43,7 +43,7 @@
 
 #include <gst/base/gstbasesrc.h>
 #include <gst/gsttaglist.h>
-#include <gst/audio/streamvolume.h>
+#include <gst/audio/audio.h>
 
 #include "pulsesrc.h"
 #include "pulseutil.h"
diff --git a/ext/pulse/pulseutil.c b/ext/pulse/pulseutil.c
index d6192eb1cd..d49125ac3c 100644
--- a/ext/pulse/pulseutil.c
+++ b/ext/pulse/pulseutil.c
@@ -23,6 +23,8 @@
 #include "config.h"
 #endif
 
+#include <gst/audio/audio.h>
+
 #include "pulseutil.h"
 
 #ifdef HAVE_UNISTD_H
diff --git a/ext/vpx/gstvp8enc.c b/ext/vpx/gstvp8enc.c
index e1c30306c0..1f0522dbe5 100644
--- a/ext/vpx/gstvp8enc.c
+++ b/ext/vpx/gstvp8enc.c
@@ -60,13 +60,12 @@
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 
 #include <gst/tag/tag.h>
+#include <gst/video/video.h>
 #include <string.h>
 
 #include "gstvp8utils.h"
 #include "gstvp8enc.h"
 
-#include <gst/video/gstvideometa.h>
-
 GST_DEBUG_CATEGORY_STATIC (gst_vp8enc_debug);
 #define GST_CAT_DEFAULT gst_vp8enc_debug
 
diff --git a/sys/oss/common.h b/sys/oss/common.h
index 8e05d0864a..6c3632f26b 100644
--- a/sys/oss/common.h
+++ b/sys/oss/common.h
@@ -18,6 +18,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <gst/audio/audio.h>
+
 #define SET_PARAM(_oss, _name, _val, _detail)   \
 G_STMT_START {                                  \
   int _tmp = _val;                              \
diff --git a/sys/oss/gstossaudio.c b/sys/oss/gstossaudio.c
index e6256b4063..7194e2e84e 100644
--- a/sys/oss/gstossaudio.c
+++ b/sys/oss/gstossaudio.c
@@ -23,6 +23,7 @@
 
 #include "gst/gst-i18n-plugin.h"
 
+#include "common.h"
 #include "gstosssink.h"
 #include "gstosssrc.h"
 
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index 3c9bb9b36f..742c59dc44 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -59,8 +59,8 @@
 # endif /* HAVE_OSS_INCLUDE_IN_ROOT */
 #endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
-#include "gstosssrc.h"
 #include "common.h"
+#include "gstosssrc.h"
 
 #include <gst/gst-i18n-plugin.h>
 
diff --git a/sys/oss4/oss4-audio.h b/sys/oss4/oss4-audio.h
index 5581fe3b2a..054ecf9264 100644
--- a/sys/oss4/oss4-audio.h
+++ b/sys/oss4/oss4-audio.h
@@ -21,7 +21,7 @@
 #define GST_OSS4_AUDIO_H_
 
 #include <gst/gst.h>
-#include <gst/audio/gstaudioringbuffer.h>
+#include <gst/audio/audio.h>
 
 /* This is the minimum version we require */
 #define GST_MIN_OSS4_VERSION  0x040003