From fb7baa1cd370a16f78c125504c2b5cb622ee2f05 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Sun, 27 Jan 2013 12:51:52 -0300 Subject: [PATCH] Rename GESAssetClip to GESClipAsset --- docs/libs/ges-docs.sgml | 2 +- docs/libs/ges-sections.txt | 26 +++++------ ges/Makefile.am | 4 +- ges/{ges-asset-clip.c => ges-clip-asset.c} | 50 +++++++++++----------- ges/{ges-asset-clip.h => ges-clip-asset.h} | 32 +++++++------- ges/ges-types.h | 4 +- ges/ges-uri-asset.c | 4 +- ges/ges-uri-asset.h | 6 +-- ges/ges-uri-clip.c | 4 +- ges/ges.h | 2 +- 10 files changed, 67 insertions(+), 67 deletions(-) rename ges/{ges-asset-clip.c => ges-clip-asset.c} (77%) rename ges/{ges-asset-clip.h => ges-clip-asset.h} (57%) diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml index 9ea512b142..c871945e37 100644 --- a/docs/libs/ges-docs.sgml +++ b/docs/libs/ges-docs.sgml @@ -102,7 +102,7 @@ platform as well as Windows. It is released under the GNU Library General Public Assets - + diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt index 5d1a2460de..2aef0d8c81 100644 --- a/docs/libs/ges-sections.txt +++ b/docs/libs/ges-sections.txt @@ -986,20 +986,20 @@ ges_asset_get_type
-ges-asset-clip -GESAssetClip -GESAssetClip -ges_asset_clip_get_type -ges_asset_clip_set_supported_formats -ges_asset_clip_get_supported_formats +ges-clip-asset +GESClipAsset +GESClipAsset +ges_clip_asset_get_type +ges_clip_asset_set_supported_formats +ges_clip_asset_get_supported_formats -GESAssetClipPrivate -GES_ASSET_CLIP -GES_TYPE_ASSET_CLIP -GES_ASSET_CLIP_CLASS -GES_IS_ASSET_CLIP -GES_IS_ASSET_CLIP_CLASS -GES_ASSET_CLIP_GET_CLASS +GESClipAssetPrivate +GES_CLIP_ASSET +GES_TYPE_CLIP_ASSET +GES_CLIP_ASSET_CLASS +GES_IS_CLIP_ASSET +GES_IS_CLIP_ASSET_CLASS +GES_CLIP_ASSET_GET_CLASS
diff --git a/ges/Makefile.am b/ges/Makefile.am index f154c768b1..87bae5cccb 100644 --- a/ges/Makefile.am +++ b/ges/Makefile.am @@ -49,7 +49,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \ ges-pitivi-formatter.c \ ges-asset.c \ ges-uri-asset.c \ - ges-asset-clip.c \ + ges-clip-asset.c \ ges-track-element-asset.c \ ges-extractable.c \ ges-project.c \ @@ -103,7 +103,7 @@ libges_@GST_API_VERSION@include_HEADERS = \ ges-pitivi-formatter.h \ ges-asset.h \ ges-uri-asset.h \ - ges-asset-clip.h \ + ges-clip-asset.h \ ges-track-element-asset.h \ ges-extractable.h \ ges-project.h \ diff --git a/ges/ges-asset-clip.c b/ges/ges-clip-asset.c similarity index 77% rename from ges/ges-asset-clip.c rename to ges/ges-clip-asset.c index c25a2d8422..1ebe26eb98 100644 --- a/ges/ges-asset-clip.c +++ b/ges/ges-clip-asset.c @@ -18,7 +18,7 @@ * Boston, MA 02111-1307, USA. */ /** - * SECTION: ges-asset-clip + * SECTION: ges-clip-asset * @short_description: A GESAsset subclass specialized in GESClip extraction * * The #GESUriClipAsset is a special #GESAsset specilized in #GESClip. @@ -26,16 +26,16 @@ * from it can potentialy create #GESTrackElement for. */ -#include "ges-asset-clip.h" +#include "ges-clip-asset.h" -G_DEFINE_TYPE (GESAssetClip, ges_asset_clip, GES_TYPE_ASSET); -#define GES_ASSET_CLIP_GET_PRIVATE(o)\ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GES_TYPE_ASSET_CLIP, \ - GESAssetClipPrivate)) +G_DEFINE_TYPE (GESClipAsset, ges_clip_asset, GES_TYPE_ASSET); +#define GES_CLIP_ASSET_GET_PRIVATE(o)\ + (G_TYPE_INSTANCE_GET_PRIVATE ((o), GES_TYPE_CLIP_ASSET, \ + GESClipAssetPrivate)) -#define parent_class ges_asset_clip_parent_class +#define parent_class ges_clip_asset_parent_class -struct _GESAssetClipPrivate +struct _GESClipAssetPrivate { GESTrackType supportedformats; }; @@ -69,7 +69,7 @@ static void _get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { - GESAssetClipPrivate *priv = GES_ASSET_CLIP (object)->priv; + GESClipAssetPrivate *priv = GES_CLIP_ASSET (object)->priv; switch (property_id) { case PROP_SUPPORTED_FORMATS: g_value_set_flags (value, priv->supportedformats); @@ -83,7 +83,7 @@ static void _set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { - GESAssetClipPrivate *priv = GES_ASSET_CLIP (object)->priv; + GESClipAssetPrivate *priv = GES_CLIP_ASSET (object)->priv; switch (property_id) { case PROP_SUPPORTED_FORMATS: @@ -95,9 +95,9 @@ _set_property (GObject * object, guint property_id, } static void -ges_asset_clip_init (GESAssetClip * self) +ges_clip_asset_init (GESClipAsset * self) { - self->priv = GES_ASSET_CLIP_GET_PRIVATE (self); + self->priv = GES_CLIP_ASSET_GET_PRIVATE (self); } static void @@ -110,18 +110,18 @@ _constructed (GObject * object) pspec = G_PARAM_SPEC_FLAGS (g_object_class_find_property (class, "supported-formats")); - GES_ASSET_CLIP (object)->priv->supportedformats = pspec->default_value; + GES_CLIP_ASSET (object)->priv->supportedformats = pspec->default_value; g_type_class_unref (class); G_OBJECT_CLASS (parent_class)->constructed (object); } static void -ges_asset_clip_class_init (GESAssetClipClass * self_class) +ges_clip_asset_class_init (GESClipAssetClass * self_class) { GObjectClass *object_class = G_OBJECT_CLASS (self_class); - g_type_class_add_private (self_class, sizeof (GESAssetClipPrivate)); + g_type_class_add_private (self_class, sizeof (GESClipAssetPrivate)); object_class->constructed = _constructed; object_class->dispose = _dispose; object_class->finalize = _finalize; @@ -129,7 +129,7 @@ ges_asset_clip_class_init (GESAssetClipClass * self_class) object_class->set_property = _set_property; /** - * GESAssetClip:supported-formats: + * GESClipAsset:supported-formats: * * The formats supported by the asset. */ @@ -148,24 +148,24 @@ ges_asset_clip_class_init (GESAssetClipClass * self_class) * * ***********************************************/ /** - * ges_asset_clip_set_supported_formats: - * @self: a #GESAssetClip - * @supportedformats: The track types supported by the GESAssetClip + * ges_clip_asset_set_supported_formats: + * @self: a #GESClipAsset + * @supportedformats: The track types supported by the GESClipAsset * * Sets track types for which objects extracted from @self can create #GESTrackElement */ void -ges_asset_clip_set_supported_formats (GESAssetClip * self, +ges_clip_asset_set_supported_formats (GESClipAsset * self, GESTrackType supportedformats) { - g_return_if_fail (GES_IS_ASSET_CLIP (self)); + g_return_if_fail (GES_IS_CLIP_ASSET (self)); self->priv->supportedformats = supportedformats; } /** - * ges_asset_clip_get_supported_formats: - * @self: a #GESAssetClip + * ges_clip_asset_get_supported_formats: + * @self: a #GESClipAsset * * Gets track types for which objects extracted from @self can create #GESTrackElement * @@ -173,9 +173,9 @@ ges_asset_clip_set_supported_formats (GESAssetClip * self, * a layer */ GESTrackType -ges_asset_clip_get_supported_formats (GESAssetClip * self) +ges_clip_asset_get_supported_formats (GESClipAsset * self) { - g_return_val_if_fail (GES_IS_ASSET_CLIP (self), GES_TRACK_TYPE_UNKNOWN); + g_return_val_if_fail (GES_IS_CLIP_ASSET (self), GES_TRACK_TYPE_UNKNOWN); return self->priv->supportedformats; } diff --git a/ges/ges-asset-clip.h b/ges/ges-clip-asset.h similarity index 57% rename from ges/ges-asset-clip.h rename to ges/ges-clip-asset.h index 5907bd6d24..915cf54068 100644 --- a/ges/ges-asset-clip.h +++ b/ges/ges-clip-asset.h @@ -20,8 +20,8 @@ */ -#ifndef GES_ASSET_CLIP_H -#define GES_ASSET_CLIP_H +#ifndef GES_CLIP_ASSET_H +#define GES_CLIP_ASSET_H #include #include @@ -29,36 +29,36 @@ G_BEGIN_DECLS -#define GES_TYPE_ASSET_CLIP (ges_asset_clip_get_type ()) -#define GES_ASSET_CLIP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_ASSET_CLIP, GESAssetClip)) -#define GES_ASSET_CLIP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_ASSET_CLIP, GESAssetClipClass)) -#define GES_IS_ASSET_CLIP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_ASSET_CLIP)) -#define GES_IS_ASSET_CLIP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_ASSET_CLIP)) -#define GES_ASSET_CLIP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_ASSET_CLIP, GESAssetClipClass)) +#define GES_TYPE_CLIP_ASSET (ges_clip_asset_get_type ()) +#define GES_CLIP_ASSET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GES_TYPE_CLIP_ASSET, GESClipAsset)) +#define GES_CLIP_ASSET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GES_TYPE_CLIP_ASSET, GESClipAssetClass)) +#define GES_IS_CLIP_ASSET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GES_TYPE_CLIP_ASSET)) +#define GES_IS_CLIP_ASSET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GES_TYPE_CLIP_ASSET)) +#define GES_CLIP_ASSET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_CLIP_ASSET, GESClipAssetClass)) -typedef struct _GESAssetClipPrivate GESAssetClipPrivate; +typedef struct _GESClipAssetPrivate GESClipAssetPrivate; -struct _GESAssetClip +struct _GESClipAsset { GESAsset parent; /* */ - GESAssetClipPrivate *priv; + GESClipAssetPrivate *priv; gpointer _ges_reserved[GES_PADDING]; }; -struct _GESAssetClipClass +struct _GESClipAssetClass { GESAssetClass parent; gpointer _ges_reserved[GES_PADDING]; }; -GType ges_asset_clip_get_type (void); -void ges_asset_clip_set_supported_formats (GESAssetClip *self, +GType ges_clip_asset_get_type (void); +void ges_clip_asset_set_supported_formats (GESClipAsset *self, GESTrackType supportedformats); -GESTrackType ges_asset_clip_get_supported_formats (GESAssetClip *self); +GESTrackType ges_clip_asset_get_supported_formats (GESClipAsset *self); G_END_DECLS -#endif /* _GES_ASSET_CLIP_H */ +#endif /* _GES_CLIP_ASSET_H */ diff --git a/ges/ges-types.h b/ges/ges-types.h index 5086837499..8b1f49ea8f 100644 --- a/ges/ges-types.h +++ b/ges/ges-types.h @@ -143,8 +143,8 @@ typedef struct _GESPitiviFormatterClass GESPitiviFormatterClass; typedef struct _GESAsset GESAsset; typedef struct _GESAssetClass GESAssetClass; -typedef struct _GESAssetClip GESAssetClip; -typedef struct _GESAssetClipClass GESAssetClipClass; +typedef struct _GESClipAsset GESClipAsset; +typedef struct _GESClipAssetClass GESClipAssetClass; typedef struct _GESUriClipAsset GESUriClipAsset; typedef struct _GESUriClipAssetClass GESUriClipAssetClass; diff --git a/ges/ges-uri-asset.c b/ges/ges-uri-asset.c index 6ec41641c9..ce4e03ac1e 100644 --- a/ges/ges-uri-asset.c +++ b/ges/ges-uri-asset.c @@ -41,7 +41,7 @@ initable_iface_init (GInitableIface * initable_iface) } G_DEFINE_TYPE_WITH_CODE (GESUriClipAsset, ges_uri_clip_asset, - GES_TYPE_ASSET_CLIP, + GES_TYPE_CLIP_ASSET, G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)); /* TODO: We should monitor files here, and add some way of reporting changes @@ -290,7 +290,7 @@ ges_uri_clip_asset_set_info (GESUriClipAsset * self, GstDiscovererInfo * info) gst_discoverer_stream_info_get_stream_id (sinf)); _create_uri_source_asset (self, sinf, type); } - ges_asset_clip_set_supported_formats (GES_ASSET_CLIP + ges_clip_asset_set_supported_formats (GES_CLIP_ASSET (self), supportedformats); if (stream_list) diff --git a/ges/ges-uri-asset.h b/ges/ges-uri-asset.h index f7468ea56c..40a7f82114 100644 --- a/ges/ges-uri-asset.h +++ b/ges/ges-uri-asset.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include G_BEGIN_DECLS @@ -47,7 +47,7 @@ GType ges_uri_clip_asset_get_type (void); struct _GESUriClipAsset { - GESAssetClip parent; + GESClipAsset parent; /* */ GESUriClipAssetPrivate *priv; @@ -58,7 +58,7 @@ struct _GESUriClipAsset struct _GESUriClipAssetClass { - GESAssetClipClass parent_class; + GESClipAssetClass parent_class; /* */ GstDiscoverer *discoverer; diff --git a/ges/ges-uri-clip.c b/ges/ges-uri-clip.c index bd260b9a07..4d8a4b458a 100644 --- a/ges/ges-uri-clip.c +++ b/ges/ges-uri-clip.c @@ -242,8 +242,8 @@ extractable_set_asset (GESExtractable * self, GESAsset * asset) if (ges_clip_get_supported_formats (clip) == GES_TRACK_TYPE_UNKNOWN) { ges_clip_set_supported_formats (clip, - ges_asset_clip_get_supported_formats - (GES_ASSET_CLIP (filesource_asset))); + ges_clip_asset_get_supported_formats + (GES_CLIP_ASSET (filesource_asset))); } GES_TIMELINE_ELEMENT (uriclip)->asset = asset; diff --git a/ges/ges.h b/ges/ges.h index e6a2b34768..0a6b1b444f 100644 --- a/ges/ges.h +++ b/ges/ges.h @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include