gst-libs/gst/audio/audio.*: Readd the deprecation guards, but preserve compilability.

Original commit message from CVS:
* gst-libs/gst/audio/audio.c:
* gst-libs/gst/audio/audio.h:
Readd the deprecation guards, but preserve compilability.

diff --git a/ChangeLog b/ChangeLog
index 29a58f9..c7674d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-01  Stefan Kost  <ensonic@users.sf.net>
+
+       * gst-libs/gst/audio/audio.c:
+       * gst-libs/gst/audio/audio.h:
+         Readd the deprecation guards, but preserve compilability.
+
 2007-10-31  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/audioconvert/gstaudioconvert.c: (find_suitable_channel_layout),

diff --git a/gst-libs/gst/audio/audio.c b/gst-libs/gst/audio/audio.c
index 1a67329..86888b7 100644 (file)
--- a/gst-libs/gst/audio/audio.c
+++ b/gst-libs/gst/audio/audio.c
@@ -228,6 +228,17 @@ _gst_audio_structure_set_list (GstStructure * structure,
  * Deprecated: use gst_structure_set()
  */
 #ifndef GST_REMOVE_DEPRECATED
+#ifdef GST_DISABLE_DEPRECATED
+typedef enum
+{
+  GST_AUDIO_FIELD_RATE = (1 << 0),
+  GST_AUDIO_FIELD_CHANNELS = (1 << 1),
+  GST_AUDIO_FIELD_ENDIANNESS = (1 << 2),
+  GST_AUDIO_FIELD_WIDTH = (1 << 3),
+  GST_AUDIO_FIELD_DEPTH = (1 << 4),
+  GST_AUDIO_FIELD_SIGNED = (1 << 5),
+} GstAudioFieldFlag;
+#endif /* GST_DISABLE_DEPRECATED */
 void
 gst_audio_structure_set_int (GstStructure * structure, GstAudioFieldFlag flag)
 {

diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h
index 749def5..92f01d5 100644 (file)
--- a/gst-libs/gst/audio/audio.h
+++ b/gst-libs/gst/audio/audio.h
@@ -135,6 +135,7 @@ gboolean gst_audio_is_buffer_framed     (GstPad* pad, GstBuffer* buf);
  *
  * Deprecated: use gst_structure_set() directly
  */
+#ifndef GST_DISABLE_DEPRECATED
 typedef enum {
   GST_AUDIO_FIELD_RATE          = (1 << 0),
   GST_AUDIO_FIELD_CHANNELS      = (1 << 1),
@@ -143,6 +144,7 @@ typedef enum {
   GST_AUDIO_FIELD_DEPTH         = (1 << 4),
   GST_AUDIO_FIELD_SIGNED        = (1 << 5),
 } GstAudioFieldFlag;
+#endif
 
 #ifndef GST_DISABLE_DEPRECATED
 void gst_audio_structure_set_int (GstStructure *structure, GstAudioFieldFlag flag);