summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2018-03-13 12:21:39 +0000
committerTim-Philipp Müller <tim@centricular.com>2018-03-13 12:22:07 +0000
commit6b8f92d84fd69a19bfad92efaff2701cb17618ec (patch)
treed2bf8960e4ecd25492218e3dd5b91484519fec85
parent04d25d9e4f130bf3f9b4914ad2b9556fc50ec3d2 (diff)
audio: GST_EXPORT -> GST_AUDIO_BAD_API
We need different export decorators for the different libs. For now no actual change though, just rename before the release, and add prelude headers to define the new decorator to GST_EXPORT.
-rw-r--r--gst-libs/gst/audio/Makefile.am2
-rw-r--r--gst-libs/gst/audio/audio-bad-prelude.h31
-rw-r--r--gst-libs/gst/audio/gstnonstreamaudiodecoder.h14
-rw-r--r--gst-libs/gst/audio/meson.build2
4 files changed, 40 insertions, 9 deletions
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 89d8ce743..245f93c3f 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -23,4 +23,4 @@ libgstbadaudio_@GST_API_VERSION@_la_LIBADD = \
libgstbadaudio_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
libgstaudio_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/audio
-libgstaudio_@GST_API_VERSION@include_HEADERS = gstnonstreamaudiodecoder.h
+libgstaudio_@GST_API_VERSION@include_HEADERS = gstnonstreamaudiodecoder.h audio-bad-prelude.h
diff --git a/gst-libs/gst/audio/audio-bad-prelude.h b/gst-libs/gst/audio/audio-bad-prelude.h
new file mode 100644
index 000000000..71b326c33
--- /dev/null
+++ b/gst-libs/gst/audio/audio-bad-prelude.h
@@ -0,0 +1,31 @@
+/* GStreamer Audio Library
+ * Copyright (C) 2018 GStreamer developers
+ *
+ * audiobad-prelude.h: prelude include header for gst-audiobad library
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_AUDIO_BAD_PRELUDE_H__
+#define __GST_AUDIO_BAD_PRELUDE_H__
+
+#include <gst/gst.h>
+
+#ifndef GST_AUDIO_BAD_API
+#define GST_AUDIO_BAD_API GST_EXPORT
+#endif
+
+#endif /* __GST_AUDIO_BAD_PRELUDE_H__ */
diff --git a/gst-libs/gst/audio/gstnonstreamaudiodecoder.h b/gst-libs/gst/audio/gstnonstreamaudiodecoder.h
index d891fa70f..563a99e1b 100644
--- a/gst-libs/gst/audio/gstnonstreamaudiodecoder.h
+++ b/gst-libs/gst/audio/gstnonstreamaudiodecoder.h
@@ -24,7 +24,7 @@
#include <gst/gst.h>
#include <gst/base/gstadapter.h>
#include <gst/audio/audio.h>
-
+#include <gst/audio/audio-bad-prelude.h>
G_BEGIN_DECLS
@@ -377,31 +377,31 @@ struct _GstNonstreamAudioDecoderClass
};
-GST_EXPORT
+GST_AUDIO_BAD_API
GType gst_nonstream_audio_decoder_get_type (void);
-GST_EXPORT
+GST_AUDIO_BAD_API
void gst_nonstream_audio_decoder_handle_loop (GstNonstreamAudioDecoder * dec,
GstClockTime new_position);
-GST_EXPORT
+GST_AUDIO_BAD_API
gboolean gst_nonstream_audio_decoder_set_output_format (GstNonstreamAudioDecoder * dec,
GstAudioInfo const *audio_info);
-GST_EXPORT
+GST_AUDIO_BAD_API
gboolean gst_nonstream_audio_decoder_set_output_format_simple (GstNonstreamAudioDecoder * dec,
guint sample_rate,
GstAudioFormat sample_format,
guint num_channels);
-GST_EXPORT
+GST_AUDIO_BAD_API
void gst_nonstream_audio_decoder_get_downstream_info (GstNonstreamAudioDecoder * dec,
GstAudioFormat * format,
gint * sample_rate,
gint * num_channels);
-GST_EXPORT
+GST_AUDIO_BAD_API
GstBuffer *gst_nonstream_audio_decoder_allocate_output_buffer (GstNonstreamAudioDecoder * dec,
gsize size);
diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build
index e32bdf604..bc62c9f6f 100644
--- a/gst-libs/gst/audio/meson.build
+++ b/gst-libs/gst/audio/meson.build
@@ -1,5 +1,5 @@
badaudio_sources = ['gstnonstreamaudiodecoder.c']
-badaudio_headers = ['gstnonstreamaudiodecoder.h']
+badaudio_headers = ['gstnonstreamaudiodecoder.h', 'audio-bad-prelude.h']
install_headers(badaudio_headers, subdir : 'gstreamer-1.0/gst/audio')