From 665cc1c6f2a73bd7d837ea2ad273add2ca317bba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 13 Mar 2018 13:05:45 +0000 Subject: [PATCH] uridownloader: GST_EXPORT -> GST_URI_DOWNLOADER_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. --- gst-libs/gst/uridownloader/Makefile.am | 2 +- gst-libs/gst/uridownloader/gstfragment.h | 13 ++++----- gst-libs/gst/uridownloader/gsturidownloader.h | 14 +++++----- gst-libs/gst/uridownloader/meson.build | 1 + gst-libs/gst/uridownloader/uridownloader-prelude.h | 31 ++++++++++++++++++++++ 5 files changed, 47 insertions(+), 14 deletions(-) create mode 100644 gst-libs/gst/uridownloader/uridownloader-prelude.h diff --git a/gst-libs/gst/uridownloader/Makefile.am b/gst-libs/gst/uridownloader/Makefile.am index 91b5187..d12257a 100644 --- a/gst-libs/gst/uridownloader/Makefile.am +++ b/gst-libs/gst/uridownloader/Makefile.am @@ -7,7 +7,7 @@ libgsturidownloader_@GST_API_VERSION@includedir = \ $(includedir)/gstreamer-@GST_API_VERSION@/gst/uridownloader libgsturidownloader_@GST_API_VERSION@include_HEADERS = \ - gstfragment.h gsturidownloader.h gsturidownloader_debug.h + gstfragment.h gsturidownloader.h gsturidownloader_debug.h uridownloader-prelude.h libgsturidownloader_@GST_API_VERSION@_la_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) \ diff --git a/gst-libs/gst/uridownloader/gstfragment.h b/gst-libs/gst/uridownloader/gstfragment.h index 2e30d62..517d155 100644 --- a/gst-libs/gst/uridownloader/gstfragment.h +++ b/gst-libs/gst/uridownloader/gstfragment.h @@ -24,6 +24,7 @@ #include #include +#include G_BEGIN_DECLS @@ -65,22 +66,22 @@ struct _GstFragmentClass GObjectClass parent_class; }; -GST_EXPORT +GST_URI_DOWNLOADER_API GType gst_fragment_get_type (void); -GST_EXPORT +GST_URI_DOWNLOADER_API GstBuffer * gst_fragment_get_buffer (GstFragment *fragment); -GST_EXPORT +GST_URI_DOWNLOADER_API void gst_fragment_set_caps (GstFragment * fragment, GstCaps * caps); -GST_EXPORT +GST_URI_DOWNLOADER_API GstCaps * gst_fragment_get_caps (GstFragment * fragment); -GST_EXPORT +GST_URI_DOWNLOADER_API gboolean gst_fragment_add_buffer (GstFragment *fragment, GstBuffer *buffer); -GST_EXPORT +GST_URI_DOWNLOADER_API GstFragment * gst_fragment_new (void); G_END_DECLS diff --git a/gst-libs/gst/uridownloader/gsturidownloader.h b/gst-libs/gst/uridownloader/gsturidownloader.h index f37bef0..4be1edb 100644 --- a/gst-libs/gst/uridownloader/gsturidownloader.h +++ b/gst-libs/gst/uridownloader/gsturidownloader.h @@ -58,25 +58,25 @@ struct _GstUriDownloaderClass gpointer _gst_reserved[GST_PADDING]; }; -GST_EXPORT +GST_URI_DOWNLOADER_API GType gst_uri_downloader_get_type (void); -GST_EXPORT +GST_URI_DOWNLOADER_API GstUriDownloader * gst_uri_downloader_new (void); -GST_EXPORT +GST_URI_DOWNLOADER_API void gst_uri_downloader_set_parent (GstUriDownloader * downloader, GstElement * parent); -GST_EXPORT +GST_URI_DOWNLOADER_API GstFragment * gst_uri_downloader_fetch_uri (GstUriDownloader * downloader, const gchar * uri, const gchar * referer, gboolean compress, gboolean refresh, gboolean allow_cache, GError ** err); -GST_EXPORT +GST_URI_DOWNLOADER_API GstFragment * gst_uri_downloader_fetch_uri_with_range (GstUriDownloader * downloader, const gchar * uri, const gchar * referer, gboolean compress, gboolean refresh, gboolean allow_cache, gint64 range_start, gint64 range_end, GError ** err); -GST_EXPORT +GST_URI_DOWNLOADER_API void gst_uri_downloader_reset (GstUriDownloader *downloader); -GST_EXPORT +GST_URI_DOWNLOADER_API void gst_uri_downloader_cancel (GstUriDownloader *downloader); G_END_DECLS diff --git a/gst-libs/gst/uridownloader/meson.build b/gst-libs/gst/uridownloader/meson.build index ac97368..7c4d670 100644 --- a/gst-libs/gst/uridownloader/meson.build +++ b/gst-libs/gst/uridownloader/meson.build @@ -3,6 +3,7 @@ urid_sources = [ 'gsturidownloader.c', ] urid_headers = [ + 'uridownloader-prelude.h', 'gstfragment.h', 'gsturidownloader.h', 'gsturidownloader_debug.h', diff --git a/gst-libs/gst/uridownloader/uridownloader-prelude.h b/gst-libs/gst/uridownloader/uridownloader-prelude.h new file mode 100644 index 0000000..f5ad584 --- /dev/null +++ b/gst-libs/gst/uridownloader/uridownloader-prelude.h @@ -0,0 +1,31 @@ +/* GStreamer UriDownloader Library + * Copyright (C) 2018 GStreamer developers + * + * uridownloader-prelude.h: prelude include header for gst-uridownloader 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_URI_DOWNLOADER_PRELUDE_H__ +#define __GST_URI_DOWNLOADER_PRELUDE_H__ + +#include + +#ifndef GST_URI_DOWNLOADER_API +#define GST_URI_DOWNLOADER_API GST_EXPORT +#endif + +#endif /* __GST_URI_DOWNLOADER_PRELUDE_H__ */ -- 2.7.4