projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 001e08e)
audio: make direct includes work again
authorTim-Philipp Müller <tim@centricular.net>
Fri, 16 Aug 2013 12:06:58 +0000 (13:06 +0100)
committerTim-Philipp Müller <tim@centricular.net>
Fri, 16 Aug 2013 13:14:11 +0000 (14:14 +0100)
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

14 files changed:
gst-libs/gst/audio/audio-channels.h patch | blob | history
gst-libs/gst/audio/audio-format.h patch | blob | history
gst-libs/gst/audio/audio-info.h patch | blob | history
gst-libs/gst/audio/gstaudiobasesink.h patch | blob | history
gst-libs/gst/audio/gstaudiobasesrc.h patch | blob | history
gst-libs/gst/audio/gstaudiocdsrc.h patch | blob | history
gst-libs/gst/audio/gstaudioclock.h patch | blob | history
gst-libs/gst/audio/gstaudiodecoder.h patch | blob | history
gst-libs/gst/audio/gstaudioencoder.h patch | blob | history
gst-libs/gst/audio/gstaudiofilter.h patch | blob | history
gst-libs/gst/audio/gstaudiometa.h patch | blob | history
gst-libs/gst/audio/gstaudioringbuffer.h patch | blob | history
gst-libs/gst/audio/gstaudiosink.h patch | blob | history
gst-libs/gst/audio/gstaudiosrc.h patch | blob | history

diff --git a/gst-libs/gst/audio/audio-channels.h b/gst-libs/gst/audio/audio-channels.h
index 932494c..9481839 100644 (file)
--- a/gst-libs/gst/audio/audio-channels.h
+++ b/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
 
 /**
diff --git a/gst-libs/gst/audio/audio-format.h b/gst-libs/gst/audio/audio-format.h
index dbe6ded..d2d07b8 100644 (file)
--- a/gst-libs/gst/audio/audio-format.h
+++ b/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
diff --git a/gst-libs/gst/audio/audio-info.h b/gst-libs/gst/audio/audio-info.h
index 41b9f2f..384ff83 100644 (file)
--- a/gst-libs/gst/audio/audio-info.h
+++ b/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;
diff --git a/gst-libs/gst/audio/gstaudiobasesink.h b/gst-libs/gst/audio/gstaudiobasesink.h
index e6e0977..c149260 100644 (file)
--- a/gst-libs/gst/audio/gstaudiobasesink.h
+++ b/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
 
diff --git a/gst-libs/gst/audio/gstaudiobasesrc.h b/gst-libs/gst/audio/gstaudiobasesrc.h
index c949a50..d723514 100644 (file)
--- a/gst-libs/gst/audio/gstaudiobasesrc.h
+++ b/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
 
diff --git a/gst-libs/gst/audio/gstaudiocdsrc.h b/gst-libs/gst/audio/gstaudiocdsrc.h
index 1cadd89..593926d 100644 (file)
--- a/gst-libs/gst/audio/gstaudiocdsrc.h
+++ b/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__
 
diff --git a/gst-libs/gst/audio/gstaudioclock.h b/gst-libs/gst/audio/gstaudioclock.h
index 50792df..d04a4cd 100644 (file)
--- a/gst-libs/gst/audio/gstaudioclock.h
+++ b/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__
 
diff --git a/gst-libs/gst/audio/gstaudiodecoder.h b/gst-libs/gst/audio/gstaudiodecoder.h
index 2a18696..419f025 100644 (file)
--- a/gst-libs/gst/audio/gstaudiodecoder.h
+++ b/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
diff --git a/gst-libs/gst/audio/gstaudioencoder.h b/gst-libs/gst/audio/gstaudioencoder.h
index 846fce2..a9b691f 100644 (file)
--- a/gst-libs/gst/audio/gstaudioencoder.h
+++ b/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
 
diff --git a/gst-libs/gst/audio/gstaudiofilter.h b/gst-libs/gst/audio/gstaudiofilter.h
index 3e0c5a3..a2850bc 100644 (file)
--- a/gst-libs/gst/audio/gstaudiofilter.h
+++ b/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
 
diff --git a/gst-libs/gst/audio/gstaudiometa.h b/gst-libs/gst/audio/gstaudiometa.h
index a9ffd46..d0baa5c 100644 (file)
--- a/gst-libs/gst/audio/gstaudiometa.h
+++ b/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
diff --git a/gst-libs/gst/audio/gstaudioringbuffer.h b/gst-libs/gst/audio/gstaudioringbuffer.h
index d60aa3a..24fe350 100644 (file)
--- a/gst-libs/gst/audio/gstaudioringbuffer.h
+++ b/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())
diff --git a/gst-libs/gst/audio/gstaudiosink.h b/gst-libs/gst/audio/gstaudiosink.h
index d4fdac8..9237fef 100644 (file)
--- a/gst-libs/gst/audio/gstaudiosink.h
+++ b/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__
 
diff --git a/gst-libs/gst/audio/gstaudiosrc.h b/gst-libs/gst/audio/gstaudiosrc.h
index 7737343..c498274 100644 (file)
--- a/gst-libs/gst/audio/gstaudiosrc.h
+++ b/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__
 
Domain: Multimedia / Media Common;