audio: make direct includes work again

Not nice to break people's code if we can avoid it. Could
add a warning in the next cycle, and then require single
includes in the cycle after.

https://bugzilla.gnome.org/show_bug.cgi?id=695889

gst-libs/gst/audio/audio-channels.h

@@ -19,13 +19,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
+
 #ifndef __GST_AUDIO_CHANNELS_H__
 #define __GST_AUDIO_CHANNELS_H__
 
-#include <gst/gst.h>
-
-#include <gst/audio/audio-format.h>
-
 G_BEGIN_DECLS
 
 /**

gst-libs/gst/audio/audio-format.h

@@ -19,15 +19,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gst/gst.h>
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
 
 #ifndef __GST_AUDIO_FORMAT_H__
 #define __GST_AUDIO_FORMAT_H__
 
 G_BEGIN_DECLS
 
-#include <gst/audio/audio-enumtypes.h>
-
 #if G_BYTE_ORDER == G_BIG_ENDIAN
 #define _GST_AUDIO_FORMAT_NE(fmt) GST_AUDIO_FORMAT_ ## fmt ## BE
 #define _GST_AUDIO_FORMAT_OE(fmt) GST_AUDIO_FORMAT_ ## fmt ## LE

gst-libs/gst/audio/audio-info.h

@@ -19,14 +19,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
+
 #ifndef __GST_AUDIO_INFO_H__
 #define __GST_AUDIO_INFO_H__
 
-#include <gst/gst.h>
-#include <gst/audio/audio-enumtypes.h>
-#include <gst/audio/audio-format.h>
-#include <gst/audio/audio-channels.h>
-
 G_BEGIN_DECLS
 
 typedef struct _GstAudioInfo GstAudioInfo;

gst-libs/gst/audio/gstaudiobasesink.h

@@ -46,13 +46,14 @@
  * the methods in GstBaseSink and this class.
  */
 
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
+
 #ifndef __GST_AUDIO_BASE_SINK_H__
 #define __GST_AUDIO_BASE_SINK_H__
 
-#include <gst/gst.h>
 #include <gst/base/gstbasesink.h>
-#include "gstaudioringbuffer.h"
-#include "gstaudioclock.h"
 
 G_BEGIN_DECLS
 

gst-libs/gst/audio/gstaudiobasesrc.h

@@ -23,13 +23,15 @@
 /* a base class for audio sources.
  */
 
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
+
 #ifndef __GST_AUDIO_BASE_SRC_H__
 #define __GST_AUDIO_BASE_SRC_H__
 
 #include <gst/gst.h>
 #include <gst/base/gstpushsrc.h>
-#include "gstaudioringbuffer.h"
-#include "gstaudioclock.h"
 
 G_BEGIN_DECLS
 

gst-libs/gst/audio/gstaudiocdsrc.h

@@ -17,6 +17,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
+
 #ifndef __GST_AUDIO_CD_SRC_H__
 #define __GST_AUDIO_CD_SRC_H__
 

gst-libs/gst/audio/gstaudioclock.h

@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
+
 #ifndef __GST_AUDIO_CLOCK_H__
 #define __GST_AUDIO_CLOCK_H__
 

gst-libs/gst/audio/gstaudiodecoder.h

@@ -20,11 +20,15 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
+
 #ifndef _GST_AUDIO_DECODER_H_
 #define _GST_AUDIO_DECODER_H_
 
 #include <gst/gst.h>
-#include <gst/audio/audio.h>
 #include <gst/base/gstadapter.h>
 
 G_BEGIN_DECLS

gst-libs/gst/audio/gstaudioencoder.h

@@ -19,11 +19,14 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
+
 #ifndef __GST_AUDIO_ENCODER_H__
 #define __GST_AUDIO_ENCODER_H__
 
 #include <gst/gst.h>
-#include <gst/audio/audio.h>
 
 G_BEGIN_DECLS
 

gst-libs/gst/audio/gstaudiofilter.h

@@ -17,13 +17,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
 
 #ifndef __GST_AUDIO_FILTER_H__
 #define __GST_AUDIO_FILTER_H__
 
 #include <gst/gst.h>
 #include <gst/base/gstbasetransform.h>
-#include <gst/audio/audio.h>
 
 G_BEGIN_DECLS
 

gst-libs/gst/audio/gstaudiometa.h

@@ -20,8 +20,6 @@
 #ifndef __GST_AUDIO_META_H__
 #define __GST_AUDIO_META_H__
 
-#include <gst/gst.h>
-
 #include <gst/audio/audio.h>
 
 G_BEGIN_DECLS

gst-libs/gst/audio/gstaudioringbuffer.h

@@ -20,12 +20,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
+
 #ifndef __GST_AUDIO_RING_BUFFER_H__
 #define __GST_AUDIO_RING_BUFFER_H__
 
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-
 G_BEGIN_DECLS
 
 #define GST_TYPE_AUDIO_RING_BUFFER             (gst_audio_ring_buffer_get_type())

gst-libs/gst/audio/gstaudiosink.h

@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
+
 #ifndef __GST_AUDIO_SINK_H__
 #define __GST_AUDIO_SINK_H__
 

gst-libs/gst/audio/gstaudiosrc.h

@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifndef __GST_AUDIO_AUDIO_H__
+#include <gst/audio/audio.h>
+#endif
+
 #ifndef __GST_AUDIO_SRC_H__
 #define __GST_AUDIO_SRC_H__