From d39299459707b53270b9a12ba00ee79c78b28002 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Mon, 8 Nov 2010 09:26:27 +0530 Subject: [PATCH] discoverer: Fix argument type to _container_info_get_streams() No reason for gst_discoverer_container_info_get_streams() to not take a GstDiscovererContainerInfo as its argument. --- gst-libs/gst/pbutils/gstdiscoverer-types.c | 5 ++--- gst-libs/gst/pbutils/gstdiscoverer.h | 2 +- tools/gst-discoverer.c | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/pbutils/gstdiscoverer-types.c b/gst-libs/gst/pbutils/gstdiscoverer-types.c index 9c024d2ff9..cd36cb317b 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer-types.c +++ b/gst-libs/gst/pbutils/gstdiscoverer-types.c @@ -595,14 +595,13 @@ gst_discoverer_stream_info_get_misc (GstDiscovererStreamInfo * info) */ GList * -gst_discoverer_container_info_get_streams (GstDiscovererStreamInfo * info) +gst_discoverer_container_info_get_streams (GstDiscovererContainerInfo * info) { GList *res = NULL, *tmp; g_return_val_if_fail (GST_IS_DISCOVERER_CONTAINER_INFO (info), NULL); - for (tmp = GST_DISCOVERER_CONTAINER_INFO (info)->streams; tmp; - tmp = tmp->next) + for (tmp = info->streams; tmp; tmp = tmp->next) res = g_list_append (res, gst_discoverer_stream_info_ref ((GstDiscovererStreamInfo *) tmp->data)); diff --git a/gst-libs/gst/pbutils/gstdiscoverer.h b/gst-libs/gst/pbutils/gstdiscoverer.h index 6ea97f4b01..9a80de02c0 100644 --- a/gst-libs/gst/pbutils/gstdiscoverer.h +++ b/gst-libs/gst/pbutils/gstdiscoverer.h @@ -72,7 +72,7 @@ typedef GstMiniObjectClass GstDiscovererContainerInfoClass; GType gst_discoverer_container_info_get_type (void); -GList *gst_discoverer_container_info_get_streams(GstDiscovererStreamInfo *info); +GList *gst_discoverer_container_info_get_streams(GstDiscovererContainerInfo *info); /** diff --git a/tools/gst-discoverer.c b/tools/gst-discoverer.c index b0c242ca25..bc25409914 100644 --- a/tools/gst-discoverer.c +++ b/tools/gst-discoverer.c @@ -229,7 +229,9 @@ print_topology (GstDiscovererStreamInfo * info, gint depth) } else if (GST_IS_DISCOVERER_CONTAINER_INFO (info)) { GList *tmp, *streams; - streams = gst_discoverer_container_info_get_streams (info); + streams = + gst_discoverer_container_info_get_streams (GST_DISCOVERER_CONTAINER_INFO + (info)); for (tmp = streams; tmp; tmp = tmp->next) { GstDiscovererStreamInfo *tmpinf = (GstDiscovererStreamInfo *) tmp->data; print_topology (tmpinf, depth + 1);