From 602f6e495dff943e916eeb8da99fa63896ad27e0 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 7 Mar 2004 21:05:40 +0000 Subject: compiler fixes Original commit message from CVS: compiler fixes --- gst-libs/gst/media-info/media-info-priv.c | 5 +++-- gst-libs/gst/media-info/media-info-priv.h | 2 +- gst-libs/gst/media-info/media-info.h | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'gst-libs/gst/media-info') diff --git a/gst-libs/gst/media-info/media-info-priv.c b/gst-libs/gst/media-info/media-info-priv.c index e5cd3432..71a31f2c 100644 --- a/gst-libs/gst/media-info/media-info-priv.c +++ b/gst-libs/gst/media-info/media-info-priv.c @@ -229,7 +229,7 @@ gst_media_info_error_element (const gchar *element, GError **error) } /* initialise priv; done the first time */ -void +gboolean gmip_init (GstMediaInfoPriv *priv, GError **error) { #define GST_MEDIA_INFO_MAKE_OR_ERROR(el, factory, name, error) \ @@ -238,7 +238,7 @@ G_STMT_START { \ if (!GST_IS_ELEMENT (el)) \ { \ gst_media_info_error_element (factory, error); \ - return; \ + return FALSE; \ } \ } G_STMT_END /* create the typefind element and make sure it stays around by reffing */ @@ -251,6 +251,7 @@ G_STMT_START { \ /* source element for media info reading */ priv->source = NULL; priv->source_name = NULL; + return TRUE; } /* called at the beginning of each use cycle */ diff --git a/gst-libs/gst/media-info/media-info-priv.h b/gst-libs/gst/media-info/media-info-priv.h index 4353b695..81ee24ab 100644 --- a/gst-libs/gst/media-info/media-info-priv.h +++ b/gst-libs/gst/media-info/media-info-priv.h @@ -104,7 +104,7 @@ GstMediaInfoTrack * gmi_track_new (void); void gmip_reset (GstMediaInfoPriv *priv); -void gmip_init (GstMediaInfoPriv *priv, GError **error); +gboolean gmip_init (GstMediaInfoPriv *priv, GError **error); void gmi_clear_decoder (GstMediaInfo *info); diff --git a/gst-libs/gst/media-info/media-info.h b/gst-libs/gst/media-info/media-info.h index 4064b0e3..c134999d 100644 --- a/gst-libs/gst/media-info/media-info.h +++ b/gst-libs/gst/media-info/media-info.h @@ -100,6 +100,8 @@ typedef struct #define GST_MEDIA_INFO_FORMAT 1 << 5 #define GST_MEDIA_INFO_ALL ((1 << 6) - 1) +GQuark gst_media_info_error_quark (void); + void gst_media_info_init (void); GType gst_media_info_get_type (void); -- cgit v1.2.1