ext/sys: Fix some compilation errors caused by circular includes

ext/jack/gstjack.c

@@ -21,6 +21,7 @@
 #include "config.h"
 #endif
 
+#include "gstjack.h"
 #include "gstjackaudiosrc.h"
 #include "gstjackaudiosink.h"
 

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:

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"

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"

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);

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
 

ext/pulse/pulseprobe.c

@@ -29,6 +29,8 @@
 #include "config.h"
 #endif
 
+#include <gst/audio/audio.h>
+
 #include "pulseprobe.h"
 #include "pulseutil.h"
 

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_* */
 

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>

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"

ext/pulse/pulseutil.c

@@ -23,6 +23,8 @@
 #include "config.h"
 #endif
 
+#include <gst/audio/audio.h>
+
 #include "pulseutil.h"
 
 #ifdef HAVE_UNISTD_H

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
 

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;                              \

sys/oss/gstossaudio.c

@@ -23,6 +23,7 @@
 
 #include "gst/gst-i18n-plugin.h"
 
+#include "common.h"
 #include "gstosssink.h"
 #include "gstosssrc.h"
 

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>
 

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