From 40bfdd508a7bada7479f548724484556bf47c6b4 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 23 May 2013 13:16:22 -0400 Subject: [PATCH] Finish renaming filesource to urisource --- docs/libs/ges-sections.txt | 24 ++++++++++++------------ ges/ges-uri-asset.c | 14 +++++++------- ges/ges-uri-asset.h | 22 +++++++++++----------- ges/ges-uri-source.c | 12 ++++++------ ges/ges-uri-source.h | 28 ++++++++++++++-------------- tests/check/ges/uriclip.c | 2 +- 6 files changed, 51 insertions(+), 51 deletions(-) diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt index 2b0a8c3..e8dce1d 100644 --- a/docs/libs/ges-sections.txt +++ b/docs/libs/ges-sections.txt @@ -170,12 +170,12 @@ ges_track_filesource_new GESUriSourceClass GESUriSourcePrivate -GES_TRACK_FILESOURCE -GES_TRACK_FILESOURCE_CLASS -GES_TRACK_FILESOURCE_GET_CLASS -GES_TYPE_TRACK_FILESOURCE -GES_IS_TRACK_FILESOURCE -GES_IS_TRACK_FILESOURCE_CLASS +GES_URI_SOURCE +GES_URI_SOURCE_CLASS +GES_URI_SOURCE_GET_CLASS +GES_TYPE_URI_SOURCE +GES_IS_URI_SOURCE +GES_IS_URI_SOURCE_CLASS ges_track_filesource_get_type @@ -1071,12 +1071,12 @@ ges_uri_source_asset_get_stream_info ges_uri_source_asset_get_stream_uri GESUriSourceAssetPrivate -GES_ASSET_TRACK_FILESOURCE -GES_TYPE_ASSET_TRACK_FILESOURCE -GES_ASSET_TRACK_FILESOURCE_CLASS -GES_IS_ASSET_TRACK_FILESOURCE -GES_IS_ASSET_TRACK_FILESOURCE_CLASS -GES_ASSET_TRACK_FILESOURCE_GET_CLASS +GES_URI_SOURCE_ASSET +GES_TYPE_URI_SOURCE_ASSET +GES_URI_SOURCE_ASSET_CLASS +GES_IS_URI_SOURCE_ASSET +GES_IS_URI_SOURCE_ASSET_CLASS +GES_URI_SOURCE_ASSET_GET_CLASS
diff --git a/ges/ges-uri-asset.c b/ges/ges-uri-asset.c index d7cc7fa..045276c 100644 --- a/ges/ges-uri-asset.c +++ b/ges/ges-uri-asset.c @@ -238,11 +238,11 @@ _create_uri_source_asset (GESUriClipAsset * asset, stream_id = g_strdup_printf ("%i", GPOINTER_TO_INT (sinfo)); } - tck_filesource_asset = ges_asset_request (GES_TYPE_TRACK_FILESOURCE, + tck_filesource_asset = ges_asset_request (GES_TYPE_URI_SOURCE, stream_id, NULL); g_free (stream_id); - priv_tckasset = GES_ASSET_TRACK_FILESOURCE (tck_filesource_asset)->priv; + priv_tckasset = GES_URI_SOURCE_ASSET (tck_filesource_asset)->priv; priv_tckasset->uri = ges_asset_get_id (GES_ASSET (asset)); priv_tckasset->sinfo = gst_object_ref (sinfo); priv_tckasset->parent_asset = asset; @@ -526,7 +526,7 @@ static GESExtractable * _extract (GESAsset * asset, GError ** error) { GESTrackElement *trackelement; - GESUriSourceAssetPrivate *priv = GES_ASSET_TRACK_FILESOURCE (asset)->priv; + GESUriSourceAssetPrivate *priv = GES_URI_SOURCE_ASSET (asset)->priv; if (GST_IS_DISCOVERER_STREAM_INFO (priv->sinfo) == FALSE) { GST_WARNING_OBJECT (asset, "Can not extract as no strean info set"); @@ -568,7 +568,7 @@ ges_uri_source_asset_init (GESUriSourceAsset * self) GESUriSourceAssetPrivate *priv; priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - GES_TYPE_ASSET_TRACK_FILESOURCE, GESUriSourceAssetPrivate); + GES_TYPE_URI_SOURCE_ASSET, GESUriSourceAssetPrivate); priv->sinfo = NULL; priv->parent_asset = NULL; @@ -586,7 +586,7 @@ ges_uri_source_asset_init (GESUriSourceAsset * self) GstDiscovererStreamInfo * ges_uri_source_asset_get_stream_info (GESUriSourceAsset * asset) { - g_return_val_if_fail (GES_IS_ASSET_TRACK_FILESOURCE (asset), NULL); + g_return_val_if_fail (GES_IS_URI_SOURCE_ASSET (asset), NULL); return asset->priv->sinfo; } @@ -594,7 +594,7 @@ ges_uri_source_asset_get_stream_info (GESUriSourceAsset * asset) const gchar * ges_uri_source_asset_get_stream_uri (GESUriSourceAsset * asset) { - g_return_val_if_fail (GES_IS_ASSET_TRACK_FILESOURCE (asset), NULL); + g_return_val_if_fail (GES_IS_URI_SOURCE_ASSET (asset), NULL); return asset->priv->uri; } @@ -610,7 +610,7 @@ ges_uri_source_asset_get_stream_uri (GESUriSourceAsset * asset) const GESUriClipAsset * ges_uri_source_asset_get_filesource_asset (GESUriSourceAsset * asset) { - g_return_val_if_fail (GES_IS_ASSET_TRACK_FILESOURCE (asset), NULL); + g_return_val_if_fail (GES_IS_URI_SOURCE_ASSET (asset), NULL); return asset->priv->parent_asset; } diff --git a/ges/ges-uri-asset.h b/ges/ges-uri-asset.h index 371024b..79cbcf0 100644 --- a/ges/ges-uri-asset.h +++ b/ges/ges-uri-asset.h @@ -79,17 +79,17 @@ void ges_uri_clip_asset_class_set_timeout (GESUriClipAssetClass *class GstClockTime timeout); const GList * ges_uri_clip_asset_get_stream_assets (GESUriClipAsset *self); -#define GES_TYPE_ASSET_TRACK_FILESOURCE ges_uri_source_asset_get_type() -#define GES_ASSET_TRACK_FILESOURCE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_ASSET_TRACK_FILESOURCE, GESUriSourceAsset)) -#define GES_ASSET_TRACK_FILESOURCE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_ASSET_TRACK_FILESOURCE, GESUriSourceAssetClass)) -#define GES_IS_ASSET_TRACK_FILESOURCE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_ASSET_TRACK_FILESOURCE)) -#define GES_IS_ASSET_TRACK_FILESOURCE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_ASSET_TRACK_FILESOURCE)) -#define GES_ASSET_TRACK_FILESOURCE_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_ASSET_TRACK_FILESOURCE, GESUriSourceAssetClass)) +#define GES_TYPE_URI_SOURCE_ASSET ges_uri_source_asset_get_type() +#define GES_URI_SOURCE_ASSET(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_URI_SOURCE_ASSET, GESUriSourceAsset)) +#define GES_URI_SOURCE_ASSET_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_URI_SOURCE_ASSET, GESUriSourceAssetClass)) +#define GES_IS_URI_SOURCE_ASSET(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_URI_SOURCE_ASSET)) +#define GES_IS_URI_SOURCE_ASSET_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_URI_SOURCE_ASSET)) +#define GES_URI_SOURCE_ASSET_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_URI_SOURCE_ASSET, GESUriSourceAssetClass)) typedef struct _GESUriSourceAssetPrivate GESUriSourceAssetPrivate; diff --git a/ges/ges-uri-source.c b/ges/ges-uri-source.c index 5defac6..e6accf9 100644 --- a/ges/ges-uri-source.c +++ b/ges/ges-uri-source.c @@ -55,7 +55,7 @@ extractable_set_asset (GESExtractable * self, GESAsset * asset) static void ges_extractable_interface_init (GESExtractableInterface * iface) { - iface->asset_type = GES_TYPE_ASSET_TRACK_FILESOURCE; + iface->asset_type = GES_TYPE_URI_SOURCE_ASSET; iface->check_id = ges_extractable_check_id; iface->set_asset = extractable_set_asset; } @@ -80,7 +80,7 @@ static void ges_track_filesource_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { - GESUriSource *uriclip = GES_TRACK_FILESOURCE (object); + GESUriSource *uriclip = GES_URI_SOURCE (object); switch (property_id) { case PROP_URI: @@ -95,7 +95,7 @@ static void ges_track_filesource_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { - GESUriSource *uriclip = GES_TRACK_FILESOURCE (object); + GESUriSource *uriclip = GES_URI_SOURCE (object); switch (property_id) { case PROP_URI: @@ -109,7 +109,7 @@ ges_track_filesource_set_property (GObject * object, guint property_id, static void ges_track_filesource_dispose (GObject * object) { - GESUriSource *uriclip = GES_TRACK_FILESOURCE (object); + GESUriSource *uriclip = GES_URI_SOURCE (object); if (uriclip->uri) g_free (uriclip->uri); @@ -155,7 +155,7 @@ static void ges_track_filesource_init (GESUriSource * self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - GES_TYPE_TRACK_FILESOURCE, GESUriSourcePrivate); + GES_TYPE_URI_SOURCE, GESUriSourcePrivate); } /** @@ -170,5 +170,5 @@ ges_track_filesource_init (GESUriSource * self) GESUriSource * ges_track_filesource_new (gchar * uri) { - return g_object_new (GES_TYPE_TRACK_FILESOURCE, "uri", uri, NULL); + return g_object_new (GES_TYPE_URI_SOURCE, "uri", uri, NULL); } diff --git a/ges/ges-uri-source.h b/ges/ges-uri-source.h index 7690507..1401684 100644 --- a/ges/ges-uri-source.h +++ b/ges/ges-uri-source.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef _GES_TRACK_FILESOURCE -#define _GES_TRACK_FILESOURCE +#ifndef _GES_URI_SOURCE +#define _GES_URI_SOURCE #include #include @@ -27,22 +27,22 @@ G_BEGIN_DECLS -#define GES_TYPE_TRACK_FILESOURCE ges_track_filesource_get_type() +#define GES_TYPE_URI_SOURCE ges_track_filesource_get_type() -#define GES_TRACK_FILESOURCE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_TRACK_FILESOURCE, GESUriSource)) +#define GES_URI_SOURCE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_URI_SOURCE, GESUriSource)) -#define GES_TRACK_FILESOURCE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_TRACK_FILESOURCE, GESUriSourceClass)) +#define GES_URI_SOURCE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_URI_SOURCE, GESUriSourceClass)) -#define GES_IS_TRACK_FILESOURCE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_TRACK_FILESOURCE)) +#define GES_IS_URI_SOURCE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_URI_SOURCE)) -#define GES_IS_TRACK_FILESOURCE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_TRACK_FILESOURCE)) +#define GES_IS_URI_SOURCE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_URI_SOURCE)) -#define GES_TRACK_FILESOURCE_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_FILESOURCE, GESUriSourceClass)) +#define GES_URI_SOURCE_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_URI_SOURCE, GESUriSourceClass)) typedef struct _GESUriSourcePrivate GESUriSourcePrivate; @@ -75,5 +75,5 @@ GESUriSource* ges_track_filesource_new (gchar *uri); G_END_DECLS -#endif /* _GES_TRACK_FILESOURCE */ +#endif /* _GES_URI_SOURCE */ diff --git a/tests/check/ges/uriclip.c b/tests/check/ges/uriclip.c index a00f29e..2e31bc8 100644 --- a/tests/check/ges/uriclip.c +++ b/tests/check/ges/uriclip.c @@ -68,7 +68,7 @@ asset_created_cb (GObject * source, GAsyncResult * res, gpointer udata) GList *trackelements = ges_track_get_elements (GES_TRACK (tmp->data)); assert_equals_int (g_list_length (trackelements), 1); - fail_unless (GES_IS_TRACK_FILESOURCE (trackelements->data)); + fail_unless (GES_IS_URI_SOURCE (trackelements->data)); g_list_free_full (trackelements, gst_object_unref); } g_list_free_full (tracks, gst_object_unref); -- 2.7.4