From 96ac822b67b56aacd3bc530ca6cba1d38f90895c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 24 Sep 2018 14:40:31 +0100 Subject: [PATCH] player: fix deprecated api declaration --- gst-libs/gst/player/gstplayer-media-info.h | 8 +++----- gst-libs/gst/player/player-prelude.h | 8 ++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/player/gstplayer-media-info.h b/gst-libs/gst/player/gstplayer-media-info.h index 8d2eb4f..f49fe5c 100644 --- a/gst-libs/gst/player/gstplayer-media-info.h +++ b/gst-libs/gst/player/gstplayer-media-info.h @@ -241,16 +241,14 @@ const gchar* gst_player_media_info_get_container_format (const GstPlayerMediaIn GST_PLAYER_API GstSample* gst_player_media_info_get_image_sample (const GstPlayerMediaInfo *info); -#ifndef GST_REMOVE_DEPRECATED -GST_DEPRECATED_FOR(gst_player_media_info_get_video_streams) +GST_PLAYER_DEPRECATED_FOR(gst_player_media_info_get_video_streams) GList* gst_player_get_video_streams (const GstPlayerMediaInfo *info); -GST_DEPRECATED_FOR(gst_player_media_info_get_audio_streams) +GST_PLAYER_DEPRECATED_FOR(gst_player_media_info_get_audio_streams) GList* gst_player_get_audio_streams (const GstPlayerMediaInfo *info); -GST_DEPRECATED_FOR(gst_player_media_info_get_subtitle_streams) +GST_PLAYER_DEPRECATED_FOR(gst_player_media_info_get_subtitle_streams) GList* gst_player_get_subtitle_streams (const GstPlayerMediaInfo *info); -#endif G_END_DECLS diff --git a/gst-libs/gst/player/player-prelude.h b/gst-libs/gst/player/player-prelude.h index 2a8b87e..4b70469 100644 --- a/gst-libs/gst/player/player-prelude.h +++ b/gst-libs/gst/player/player-prelude.h @@ -32,4 +32,12 @@ # endif #endif +#ifndef GST_DISABLE_DEPRECATED +#define GST_PLAYER_DEPRECATED GST_PLAYER_API +#define GST_PLAYER_DEPRECATED_FOR(f) GST_PLAYER_API +#else +#define GST_PLAYER_DEPRECATED G_DEPRECATED GST_PLAYER_API +#define GST_PLAYER_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) GST_PLAYER_API +#endif + #endif /* __GST_PLAYER_PRELUDE_H__ */ -- 2.7.4