From d69fa0c78ebab8022adafd6ca81e630de08ce048 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 2 Apr 2018 08:42:01 +0200 Subject: [PATCH] libs: Add deprecation guard Those functions have been marked as deprecated --- gst-libs/gst/pbutils/gstdiscoverer-types.c | 4 ++++ gst-libs/gst/pbutils/gstdiscoverer.h | 5 ++++- gst-libs/gst/rtsp/gstrtsptransport.c | 2 ++ gst-libs/gst/rtsp/gstrtsptransport.h | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gst-libs/gst/pbutils/gstdiscoverer-types.c b/gst-libs/gst/pbutils/gstdiscoverer-types.c index 8bd8c23c57..95d0c188bf 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer-types.c +++ b/gst-libs/gst/pbutils/gstdiscoverer-types.c @@ -689,6 +689,7 @@ gst_discoverer_stream_info_get_stream_id (GstDiscovererStreamInfo * info) return info->stream_id; } +#ifndef GST_DISABLE_DEPRECATED /** * gst_discoverer_stream_info_get_misc: * @info: a #GstDiscovererStreamInfo @@ -707,6 +708,7 @@ gst_discoverer_stream_info_get_misc (GstDiscovererStreamInfo * info) return info->misc; } +#endif /* GstDiscovererContainerInfo */ @@ -1039,6 +1041,7 @@ DISCOVERER_INFO_ACCESSOR_CODE (seekable, gboolean, FALSE); DISCOVERER_INFO_ACCESSOR_CODE (live, gboolean, FALSE); +#ifndef GST_DISABLE_DEPRECATED /** * gst_discoverer_info_get_misc: * @info: a #GstDiscovererInfo @@ -1052,6 +1055,7 @@ DISCOVERER_INFO_ACCESSOR_CODE (live, gboolean, FALSE); */ DISCOVERER_INFO_ACCESSOR_CODE (misc, const GstStructure *, NULL); +#endif /** * gst_discoverer_info_get_tags: diff --git a/gst-libs/gst/pbutils/gstdiscoverer.h b/gst-libs/gst/pbutils/gstdiscoverer.h index b61d0ed9f6..ef5ea2feef 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer.h +++ b/gst-libs/gst/pbutils/gstdiscoverer.h @@ -78,9 +78,10 @@ const GstToc* gst_discoverer_stream_info_get_toc(GstDiscovererStreamI GST_PBUTILS_API const gchar* gst_discoverer_stream_info_get_stream_id(GstDiscovererStreamInfo* info); +#ifndef GST_DISABLE_DEPRECATED GST_PBUTILS_API const GstStructure* gst_discoverer_stream_info_get_misc(GstDiscovererStreamInfo* info); - +#endif GST_PBUTILS_API const gchar * gst_discoverer_stream_info_get_stream_type_nick(GstDiscovererStreamInfo* info); @@ -303,8 +304,10 @@ gboolean gst_discoverer_info_get_seekable(const GstDiscovererIn GST_PBUTILS_API gboolean gst_discoverer_info_get_live(const GstDiscovererInfo* info); +#ifndef GST_DISABLE_DEPRECATED GST_PBUTILS_API const GstStructure* gst_discoverer_info_get_misc(const GstDiscovererInfo* info); +#endif GST_PBUTILS_API const GstTagList* gst_discoverer_info_get_tags(const GstDiscovererInfo* info); diff --git a/gst-libs/gst/rtsp/gstrtsptransport.c b/gst-libs/gst/rtsp/gstrtsptransport.c index b5c45745e3..4cf0b294f2 100644 --- a/gst-libs/gst/rtsp/gstrtsptransport.c +++ b/gst-libs/gst/rtsp/gstrtsptransport.c @@ -198,6 +198,7 @@ gst_rtsp_transport_init (GstRTSPTransport * transport) return GST_RTSP_OK; } +#ifndef GST_DISABLE_DEPRECATED /** * gst_rtsp_transport_get_mime: * @trans: a #GstRTSPTransMode @@ -227,6 +228,7 @@ gst_rtsp_transport_get_mime (GstRTSPTransMode trans, const gchar ** mime) return GST_RTSP_OK; } +#endif /** * gst_rtsp_transport_get_media_type: diff --git a/gst-libs/gst/rtsp/gstrtsptransport.h b/gst-libs/gst/rtsp/gstrtsptransport.h index 2f3797f82f..902d9dcbf1 100644 --- a/gst-libs/gst/rtsp/gstrtsptransport.h +++ b/gst-libs/gst/rtsp/gstrtsptransport.h @@ -183,8 +183,10 @@ GstRTSPResult gst_rtsp_transport_parse (const gchar *str, GstRTSPTra GST_RTSP_API gchar* gst_rtsp_transport_as_text (GstRTSPTransport *transport); +#ifndef GST_DISABLE_DEPRECATED GST_RTSP_API GstRTSPResult gst_rtsp_transport_get_mime (GstRTSPTransMode trans, const gchar **mime); +#endif GST_RTSP_API GstRTSPResult gst_rtsp_transport_get_manager (GstRTSPTransMode trans, const gchar **manager, guint option);