fft: GST_EXPORT -> GST_FFT_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.

diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
index e250e5b..41f7dce 100644 (file)
--- a/gst-libs/gst/fft/Makefile.am
+++ b/gst-libs/gst/fft/Makefile.am
@@ -4,6 +4,7 @@ libgstfft_@GST_API_VERSION@_includedir = $(includedir)/gstreamer-@GST_API_VERSIO
 
 libgstfft_@GST_API_VERSION@_include_HEADERS = \
        fft.h \
+       fft-prelude.h \
        gstfft.h \
        gstffts16.h \
        gstffts32.h \

diff --git a/gst-libs/gst/fft/fft-prelude.h b/gst-libs/gst/fft/fft-prelude.h
new file mode 100644 (file)
index 0000000..1f3c27e
--- /dev/null
+++ b/gst-libs/gst/fft/fft-prelude.h
@@ -0,0 +1,31 @@
+/* GStreamer FFT Library
+ * Copyright (C) 2018 GStreamer developers
+ *
+ * fft-prelude.h: prelude include header for gst-fft 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_FFT_PRELUDE_H__
+#define __GST_FFT_PRELUDE_H__
+
+#include <gst/gst.h>
+
+#ifndef GST_FFT_API
+#define GST_FFT_API GST_EXPORT
+#endif
+
+#endif /* __GST_FFT_PRELUDE_H__ */

diff --git a/gst-libs/gst/fft/gstfft.h b/gst-libs/gst/fft/gstfft.h
index b496078..b3ff54a 100644 (file)
--- a/gst-libs/gst/fft/gstfft.h
+++ b/gst-libs/gst/fft/gstfft.h
@@ -24,6 +24,8 @@
 #ifndef __GST_FFT_H__
 #define __GST_FFT_H__
 
+#include <gst/fft/fft-prelude.h>
+
 G_BEGIN_DECLS
 
 /**
@@ -47,7 +49,7 @@ typedef enum
 
 /* Functions */
 
-GST_EXPORT
+GST_FFT_API
 gint gst_fft_next_fast_length (gint n) G_GNUC_CONST;
 
 G_END_DECLS

diff --git a/gst-libs/gst/fft/gstfftf32.h b/gst-libs/gst/fft/gstfftf32.h
index 262c23f..0cd5c41 100644 (file)
--- a/gst-libs/gst/fft/gstfftf32.h
+++ b/gst-libs/gst/fft/gstfftf32.h
@@ -49,21 +49,21 @@ struct _GstFFTF32Complex
 
 /* Functions */
 
-GST_EXPORT
+GST_FFT_API
 GstFFTF32 *   gst_fft_f32_new           (gint len, gboolean inverse);
 
-GST_EXPORT
+GST_FFT_API
 void          gst_fft_f32_free          (GstFFTF32 *self);
 
-GST_EXPORT
+GST_FFT_API
 void          gst_fft_f32_fft           (GstFFTF32 *self, const gfloat *timedata,
                                          GstFFTF32Complex *freqdata);
 
-GST_EXPORT
+GST_FFT_API
 void          gst_fft_f32_inverse_fft   (GstFFTF32 *self, const GstFFTF32Complex *freqdata,
                                          gfloat *timedata);
 
-GST_EXPORT
+GST_FFT_API
 void          gst_fft_f32_window        (GstFFTF32 *self, gfloat *timedata, GstFFTWindow window);
 
 G_END_DECLS

diff --git a/gst-libs/gst/fft/gstfftf64.h b/gst-libs/gst/fft/gstfftf64.h
index c03a6bd..52700b4 100644 (file)
--- a/gst-libs/gst/fft/gstfftf64.h
+++ b/gst-libs/gst/fft/gstfftf64.h
@@ -49,21 +49,21 @@ struct _GstFFTF64Complex
 
 /* Functions */
 
-GST_EXPORT
+GST_FFT_API
 GstFFTF64 *     gst_fft_f64_new         (gint len, gboolean inverse);
 
-GST_EXPORT
+GST_FFT_API
 void            gst_fft_f64_free        (GstFFTF64 *self);
 
-GST_EXPORT
+GST_FFT_API
 void            gst_fft_f64_fft         (GstFFTF64 *self, const gdouble *timedata,
                                          GstFFTF64Complex *freqdata);
 
-GST_EXPORT
+GST_FFT_API
 void            gst_fft_f64_inverse_fft (GstFFTF64 *self, const GstFFTF64Complex *freqdata,
                                          gdouble *timedata);
 
-GST_EXPORT
+GST_FFT_API
 void            gst_fft_f64_window      (GstFFTF64 *self, gdouble *timedata, GstFFTWindow window);
 
 G_END_DECLS

diff --git a/gst-libs/gst/fft/gstffts16.h b/gst-libs/gst/fft/gstffts16.h
index daaaf68..b0f9b92 100644 (file)
--- a/gst-libs/gst/fft/gstffts16.h
+++ b/gst-libs/gst/fft/gstffts16.h
@@ -49,21 +49,21 @@ struct _GstFFTS16Complex
 
 /* Functions */
 
-GST_EXPORT
+GST_FFT_API
 GstFFTS16 *     gst_fft_s16_new         (gint len, gboolean inverse);
 
-GST_EXPORT
+GST_FFT_API
 void            gst_fft_s16_free        (GstFFTS16 *self);
 
-GST_EXPORT
+GST_FFT_API
 void            gst_fft_s16_fft         (GstFFTS16 *self, const gint16 *timedata,
                                          GstFFTS16Complex *freqdata);
 
-GST_EXPORT
+GST_FFT_API
 void            gst_fft_s16_inverse_fft (GstFFTS16 *self, const GstFFTS16Complex *freqdata,
                                          gint16 *timedata);
 
-GST_EXPORT
+GST_FFT_API
 void            gst_fft_s16_window      (GstFFTS16 *self, gint16 *timedata, GstFFTWindow window);
 
 G_END_DECLS

diff --git a/gst-libs/gst/fft/gstffts32.h b/gst-libs/gst/fft/gstffts32.h
index c9512af..29505c2 100644 (file)
--- a/gst-libs/gst/fft/gstffts32.h
+++ b/gst-libs/gst/fft/gstffts32.h
@@ -49,21 +49,21 @@ struct _GstFFTS32Complex
 
 /* Functions */
 
-GST_EXPORT
+GST_FFT_API
 GstFFTS32 *     gst_fft_s32_new         (gint len, gboolean inverse);
 
-GST_EXPORT
+GST_FFT_API
 void            gst_fft_s32_free        (GstFFTS32 *self);
 
-GST_EXPORT
+GST_FFT_API
 void            gst_fft_s32_fft         (GstFFTS32 *self, const gint32 *timedata,
                                          GstFFTS32Complex *freqdata);
 
-GST_EXPORT
+GST_FFT_API
 void            gst_fft_s32_inverse_fft (GstFFTS32 *self, const GstFFTS32Complex *freqdata,
                                          gint32 *timedata);
 
-GST_EXPORT
+GST_FFT_API
 void            gst_fft_s32_window      (GstFFTS32 *self, gint32 *timedata, GstFFTWindow window);
 
 G_END_DECLS

diff --git a/gst-libs/gst/fft/meson.build b/gst-libs/gst/fft/meson.build
index ce4a622..924ab7e 100644 (file)
--- a/gst-libs/gst/fft/meson.build
+++ b/gst-libs/gst/fft/meson.build
@@ -16,6 +16,7 @@ fft_sources = [
 
 fft_headers = [
   'fft.h',
+  'fft-prelude.h',
   'gstfftf32.h',
   'gstfftf64.h',
   'gstfft.h',