From 00f9a21cd2c356900398af979897f141739ca557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 21 Dec 2016 11:32:52 +0200 Subject: [PATCH] player: Move audio/video/subtitle stream list getters into the correct namespace --- docs/libs/gst-plugins-bad-libs-sections.txt | 9 +++++---- gst-libs/gst/player/gstplayer-media-info.c | 12 ++++++------ gst-libs/gst/player/gstplayer-media-info.h | 6 +++--- gst-libs/gst/player/gstplayer.c | 6 ++++-- win32/common/libgstplayer.def | 6 +++--- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/docs/libs/gst-plugins-bad-libs-sections.txt b/docs/libs/gst-plugins-bad-libs-sections.txt index 6abb6b9b66..e5b559b8f3 100644 --- a/docs/libs/gst-plugins-bad-libs-sections.txt +++ b/docs/libs/gst-plugins-bad-libs-sections.txt @@ -1905,9 +1905,6 @@ GstPlayerError gst_player_error_get_name gst_player_get_media_info -gst_player_get_audio_streams -gst_player_get_video_streams -gst_player_get_subtitle_streams gst_player_set_audio_track gst_player_set_video_track @@ -2071,8 +2068,12 @@ gst_player_media_info_get_image_sample gst_player_media_info_get_tags gst_player_media_info_get_stream_list gst_player_media_info_get_number_of_streams -gst_player_media_info_get_number_of_video_streams + +gst_player_media_info_get_audio_streams gst_player_media_info_get_number_of_audio_streams +gst_player_media_info_get_video_streams +gst_player_media_info_get_number_of_video_streams +gst_player_media_info_get_subtitle_streams gst_player_media_info_get_number_of_subtitle_streams gst_player_stream_info_get_index diff --git a/gst-libs/gst/player/gstplayer-media-info.c b/gst-libs/gst/player/gstplayer-media-info.c index a6c17c4655..74dec7cc0a 100644 --- a/gst-libs/gst/player/gstplayer-media-info.c +++ b/gst-libs/gst/player/gstplayer-media-info.c @@ -675,14 +675,14 @@ gst_player_media_info_get_stream_list (const GstPlayerMediaInfo * info) } /** - * gst_player_get_video_streams: + * gst_player_media_info_get_video_streams: * @info: a #GstPlayerMediaInfo * * Returns: (transfer none) (element-type GstPlayerVideoInfo): A #GList of * matching #GstPlayerVideoInfo. */ GList * -gst_player_get_video_streams (const GstPlayerMediaInfo * info) +gst_player_media_info_get_video_streams (const GstPlayerMediaInfo * info) { g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), NULL); @@ -690,14 +690,14 @@ gst_player_get_video_streams (const GstPlayerMediaInfo * info) } /** - * gst_player_get_subtitle_streams: + * gst_player_media_info_get_subtitle_streams: * @info: a #GstPlayerMediaInfo * * Returns: (transfer none) (element-type GstPlayerSubtitleInfo): A #GList of * matching #GstPlayerSubtitleInfo. */ GList * -gst_player_get_subtitle_streams (const GstPlayerMediaInfo * info) +gst_player_media_info_get_subtitle_streams (const GstPlayerMediaInfo * info) { g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), NULL); @@ -705,14 +705,14 @@ gst_player_get_subtitle_streams (const GstPlayerMediaInfo * info) } /** - * gst_player_get_audio_streams: + * gst_player_media_info_get_audio_streams: * @info: a #GstPlayerMediaInfo * * Returns: (transfer none) (element-type GstPlayerAudioInfo): A #GList of * matching #GstPlayerAudioInfo. */ GList * -gst_player_get_audio_streams (const GstPlayerMediaInfo * info) +gst_player_media_info_get_audio_streams (const GstPlayerMediaInfo * info) { g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), NULL); diff --git a/gst-libs/gst/player/gstplayer-media-info.h b/gst-libs/gst/player/gstplayer-media-info.h index 6866ff6a8e..063028d1ef 100644 --- a/gst-libs/gst/player/gstplayer-media-info.h +++ b/gst-libs/gst/player/gstplayer-media-info.h @@ -177,15 +177,15 @@ GList* gst_player_media_info_get_stream_list (const GstPlayerMediaInfo *info); guint gst_player_media_info_get_number_of_streams (const GstPlayerMediaInfo *info); -GList* gst_player_get_video_streams +GList* gst_player_media_info_get_video_streams (const GstPlayerMediaInfo *info); guint gst_player_media_info_get_number_of_video_streams (const GstPlayerMediaInfo *info); -GList* gst_player_get_audio_streams +GList* gst_player_media_info_get_audio_streams (const GstPlayerMediaInfo *info); guint gst_player_media_info_get_number_of_audio_streams (const GstPlayerMediaInfo *info); -GList* gst_player_get_subtitle_streams +GList* gst_player_media_info_get_subtitle_streams (const GstPlayerMediaInfo *info); guint gst_player_media_info_get_number_of_subtitle_streams (const GstPlayerMediaInfo *info); diff --git a/gst-libs/gst/player/gstplayer.c b/gst-libs/gst/player/gstplayer.c index cac55cb1ee..a1c432d126 100644 --- a/gst-libs/gst/player/gstplayer.c +++ b/gst-libs/gst/player/gstplayer.c @@ -2366,7 +2366,8 @@ get_from_tags (GstPlayer * self, GstPlayerMediaInfo * media_info, /* if global tag does not exit then try video and audio streams */ GST_DEBUG_OBJECT (self, "trying video tags"); - for (l = gst_player_get_video_streams (media_info); l != NULL; l = l->next) { + for (l = gst_player_media_info_get_video_streams (media_info); l != NULL; + l = l->next) { GstTagList *tags; tags = gst_player_stream_info_get_tags ((GstPlayerStreamInfo *) l->data); @@ -2378,7 +2379,8 @@ get_from_tags (GstPlayer * self, GstPlayerMediaInfo * media_info, } GST_DEBUG_OBJECT (self, "trying audio tags"); - for (l = gst_player_get_audio_streams (media_info); l != NULL; l = l->next) { + for (l = gst_player_media_info_get_audio_streams (media_info); l != NULL; + l = l->next) { GstTagList *tags; tags = gst_player_stream_info_get_tags ((GstPlayerStreamInfo *) l->data); diff --git a/win32/common/libgstplayer.def b/win32/common/libgstplayer.def index 8aa1d23263..ad952e9257 100644 --- a/win32/common/libgstplayer.def +++ b/win32/common/libgstplayer.def @@ -18,7 +18,6 @@ EXPORTS gst_player_error_quark gst_player_g_main_context_signal_dispatcher_get_type gst_player_g_main_context_signal_dispatcher_new - gst_player_get_audio_streams gst_player_get_audio_video_offset gst_player_get_color_balance gst_player_get_config @@ -34,13 +33,12 @@ EXPORTS gst_player_get_pipeline gst_player_get_position gst_player_get_rate - gst_player_get_subtitle_streams gst_player_get_subtitle_uri gst_player_get_type gst_player_get_uri - gst_player_get_video_streams gst_player_get_volume gst_player_has_color_balance + gst_player_media_info_get_audio_streams gst_player_media_info_get_container_format gst_player_media_info_get_duration gst_player_media_info_get_image_sample @@ -49,10 +47,12 @@ EXPORTS gst_player_media_info_get_number_of_subtitle_streams gst_player_media_info_get_number_of_video_streams gst_player_media_info_get_stream_list + gst_player_media_info_get_subtitle_streams gst_player_media_info_get_tags gst_player_media_info_get_title gst_player_media_info_get_type gst_player_media_info_get_uri + gst_player_media_info_get_video_streams gst_player_media_info_is_live gst_player_media_info_is_seekable gst_player_new