From a0639dad38a4f82dbff4284ef60d482f0172f456 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Fri, 25 Nov 2011 13:11:54 +0000
Subject: [PATCH] audio: remove unstable API guards from the audio decoder and
 encoder base classes

---
 ext/vorbis/Makefile.am               | 4 ++--
 gst-libs/gst/audio/Makefile.am       | 1 -
 gst-libs/gst/audio/gstaudiodecoder.c | 1 -
 gst-libs/gst/audio/gstaudiodecoder.h | 5 -----
 gst-libs/gst/audio/gstaudioencoder.c | 1 -
 gst-libs/gst/audio/gstaudioencoder.h | 5 -----
 6 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am
index 9678a31..81799bd 100644
--- a/ext/vorbis/Makefile.am
+++ b/ext/vorbis/Makefile.am
@@ -11,7 +11,7 @@ libgstvorbis_la_SOURCES = gstvorbis.c \
 			  gstvorbistag.c \
 			  gstvorbiscommon.c
 
-libgstvorbis_la_CFLAGS = -DGST_USE_UNSTABLE_API \
+libgstvorbis_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(VORBIS_CFLAGS)
 ## AM_PATH_VORBIS also sets VORBISENC_LIBS
 libgstvorbis_la_LIBADD = \
@@ -28,7 +28,7 @@ plugin_LTLIBRARIES += libgstivorbisdec.la
 
 libgstivorbisdec_la_SOURCES = gstivorbisdec.c \
 	gstvorbisdec.c gstvorbisdeclib.c gstvorbiscommon.c
-libgstivorbisdec_la_CFLAGS = -DGST_USE_UNSTABLE_API \
+libgstivorbisdec_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
 	-DTREMOR $(IVORBIS_CFLAGS)
 libgstivorbisdec_la_LIBADD = \
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 882b611..6e89c47 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -77,7 +77,6 @@ GstAudio-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_MAJORMI
 		$(INTROSPECTION_SCANNER) -v --namespace GstAudio \
 		--nsversion=@GST_MAJORMINOR@ \
 		--strip-prefix=Gst \
-		-DGST_USE_UNSTABLE_API \
 		-I$(top_srcdir)/gst-libs \
 		-I$(top_builddir)/gst-libs \
 		$(gir_cincludes) \
diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c
index a45e4e5..0f5d7cc 100644
--- a/gst-libs/gst/audio/gstaudiodecoder.c
+++ b/gst-libs/gst/audio/gstaudiodecoder.c
@@ -149,7 +149,6 @@
 #include "config.h"
 #endif
 
-#define GST_USE_UNSTABLE_API
 #include "gstaudiodecoder.h"
 #include <gst/pbutils/descriptions.h>
 
diff --git a/gst-libs/gst/audio/gstaudiodecoder.h b/gst-libs/gst/audio/gstaudiodecoder.h
index 783f83e..b080163 100644
--- a/gst-libs/gst/audio/gstaudiodecoder.h
+++ b/gst-libs/gst/audio/gstaudiodecoder.h
@@ -23,11 +23,6 @@
 #ifndef _GST_AUDIO_DECODER_H_
 #define _GST_AUDIO_DECODER_H_
 
-#ifndef GST_USE_UNSTABLE_API
-#warning "GstAudioDecoder is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
 #include <gst/gst.h>
 #include <gst/audio/audio.h>
 #include <gst/base/gstadapter.h>
diff --git a/gst-libs/gst/audio/gstaudioencoder.c b/gst-libs/gst/audio/gstaudioencoder.c
index 14064f0..ded7502 100644
--- a/gst-libs/gst/audio/gstaudioencoder.c
+++ b/gst-libs/gst/audio/gstaudioencoder.c
@@ -151,7 +151,6 @@
 #  include "config.h"
 #endif
 
-#define GST_USE_UNSTABLE_API
 #include "gstaudioencoder.h"
 #include <gst/base/gstadapter.h>
 #include <gst/audio/audio.h>
diff --git a/gst-libs/gst/audio/gstaudioencoder.h b/gst-libs/gst/audio/gstaudioencoder.h
index 263a635..523d39a 100644
--- a/gst-libs/gst/audio/gstaudioencoder.h
+++ b/gst-libs/gst/audio/gstaudioencoder.h
@@ -22,11 +22,6 @@
 #ifndef __GST_AUDIO_ENCODER_H__
 #define __GST_AUDIO_ENCODER_H__
 
-#ifndef GST_USE_UNSTABLE_API
-#warning "GstAudioEncoder is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
 #include <gst/gst.h>
 #include <gst/audio/audio.h>
 
-- 
2.7.4