summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2018-03-13 12:17:50 +0000
committerTim-Philipp Müller <tim@centricular.com>2018-03-13 12:17:50 +0000
commit04d25d9e4f130bf3f9b4914ad2b9556fc50ec3d2 (patch)
tree1d5307aac672362ea116010bb3a2e686761b86b6
parentae2e53ac97efc7eb7d95f20bc4dae551fc1b013d (diff)
adaptivedemux: GST_EXPORT -> GST_ADAPTIVE_DEMUX_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/adaptivedemux/Makefile.am2
-rw-r--r--gst-libs/gst/adaptivedemux/adaptive-demux-prelude.h31
-rw-r--r--gst-libs/gst/adaptivedemux/gstadaptivedemux.h25
3 files changed, 45 insertions, 13 deletions
diff --git a/gst-libs/gst/adaptivedemux/Makefile.am b/gst-libs/gst/adaptivedemux/Makefile.am
index 74d7c4276..2af05173a 100644
--- a/gst-libs/gst/adaptivedemux/Makefile.am
+++ b/gst-libs/gst/adaptivedemux/Makefile.am
@@ -8,7 +8,7 @@ libgstadaptivedemux_@GST_API_VERSION@_la_SOURCES = \
libgstadaptivedemux_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/adaptivedemux
-noinst_HEADERS = gstadaptivedemux.h
+noinst_HEADERS = gstadaptivedemux.h adaptive-demux-prelude.h
libgstadaptivedemux_@GST_API_VERSION@_la_CFLAGS = \
$(GST_PLUGINS_BAD_CFLAGS) \
diff --git a/gst-libs/gst/adaptivedemux/adaptive-demux-prelude.h b/gst-libs/gst/adaptivedemux/adaptive-demux-prelude.h
new file mode 100644
index 000000000..402a78fa5
--- /dev/null
+++ b/gst-libs/gst/adaptivedemux/adaptive-demux-prelude.h
@@ -0,0 +1,31 @@
+/* GStreamer AdaptiveDemux Library
+ * Copyright (C) 2018 GStreamer developers
+ *
+ * adaptive-demux-prelude.h: prelude include header for gst-adaptivedemux 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_ADAPTIVE_DEMUX_PRELUDE_H__
+#define __GST_ADAPTIVE_DEMUX_PRELUDE_H__
+
+#include <gst/gst.h>
+
+#ifndef GST_ADAPTIVE_DEMUX_API
+#define GST_ADAPTIVE_DEMUX_API GST_EXPORT
+#endif
+
+#endif /* __GST_ADAPTIVE_DEMUX_PRELUDE_H__ */
diff --git a/gst-libs/gst/adaptivedemux/gstadaptivedemux.h b/gst-libs/gst/adaptivedemux/gstadaptivedemux.h
index 52e029e6d..c1a7f6fdf 100644
--- a/gst-libs/gst/adaptivedemux/gstadaptivedemux.h
+++ b/gst-libs/gst/adaptivedemux/gstadaptivedemux.h
@@ -25,6 +25,7 @@
#include <gst/gst.h>
#include <gst/base/gstadapter.h>
#include <gst/uridownloader/gsturidownloader.h>
+#include <gst/adaptivedemux/adaptive-demux-prelude.h>
G_BEGIN_DECLS
@@ -483,49 +484,49 @@ struct _GstAdaptiveDemuxClass
gboolean (*requires_periodical_playlist_update) (GstAdaptiveDemux * demux);
};
-GST_EXPORT
+GST_ADAPTIVE_DEMUX_API
GType gst_adaptive_demux_get_type (void);
-GST_EXPORT
+GST_ADAPTIVE_DEMUX_API
void gst_adaptive_demux_set_stream_struct_size (GstAdaptiveDemux * demux,
gsize struct_size);
-GST_EXPORT
+GST_ADAPTIVE_DEMUX_API
GstAdaptiveDemuxStream *gst_adaptive_demux_stream_new (GstAdaptiveDemux * demux,
GstPad * pad);
-GST_EXPORT
+GST_ADAPTIVE_DEMUX_API
GstAdaptiveDemuxStream *gst_adaptive_demux_find_stream_for_pad (GstAdaptiveDemux * demux,
GstPad * pad);
-GST_EXPORT
+GST_ADAPTIVE_DEMUX_API
void gst_adaptive_demux_stream_set_caps (GstAdaptiveDemuxStream * stream,
GstCaps * caps);
-GST_EXPORT
+GST_ADAPTIVE_DEMUX_API
void gst_adaptive_demux_stream_set_tags (GstAdaptiveDemuxStream * stream,
GstTagList * tags);
-GST_EXPORT
+GST_ADAPTIVE_DEMUX_API
void gst_adaptive_demux_stream_fragment_clear (GstAdaptiveDemuxStreamFragment * f);
-GST_EXPORT
+GST_ADAPTIVE_DEMUX_API
GstFlowReturn gst_adaptive_demux_stream_push_buffer (GstAdaptiveDemuxStream * stream, GstBuffer * buffer);
-GST_EXPORT
+GST_ADAPTIVE_DEMUX_API
GstFlowReturn
gst_adaptive_demux_stream_advance_fragment (GstAdaptiveDemux * demux,
GstAdaptiveDemuxStream * stream, GstClockTime duration);
-GST_EXPORT
+GST_ADAPTIVE_DEMUX_API
void gst_adaptive_demux_stream_queue_event (GstAdaptiveDemuxStream * stream,
GstEvent * event);
-GST_EXPORT
+GST_ADAPTIVE_DEMUX_API
GstClockTime gst_adaptive_demux_get_monotonic_time (GstAdaptiveDemux * demux);
-GST_EXPORT
+GST_ADAPTIVE_DEMUX_API
GDateTime *gst_adaptive_demux_get_client_now_utc (GstAdaptiveDemux * demux);
G_END_DECLS