From 88ab612df2615ad2d01dc07d08ef91dc3e77b8c9 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Fri, 6 May 2011 19:36:35 +0200 Subject: [PATCH] ges: Include indentation fixes --- ges/ges-timeline-object.h | 64 +++++++++++-------- ges/ges-timeline-parse-launch-effect.h | 5 +- ges/ges-track-object.h | 110 +++++++++++++++++++-------------- 3 files changed, 105 insertions(+), 74 deletions(-) diff --git a/ges/ges-timeline-object.h b/ges/ges-timeline-object.h index c919233..7f69758 100644 --- a/ges/ges-timeline-object.h +++ b/ges/ges-timeline-object.h @@ -203,54 +203,64 @@ struct _GESTimelineObjectClass { GType ges_timeline_object_get_type (void); -void ges_timeline_object_set_start (GESTimelineObject * object, guint64 start); -void ges_timeline_object_set_inpoint (GESTimelineObject * object, guint64 inpoint); -void ges_timeline_object_set_duration (GESTimelineObject * object, guint64 duration); -void ges_timeline_object_set_priority (GESTimelineObject * object, guint priority); - -void ges_timeline_object_set_layer (GESTimelineObject * object, - GESTimelineLayer * layer); - +/* Setters */ +void ges_timeline_object_set_start (GESTimelineObject * object, + guint64 start); +void ges_timeline_object_set_inpoint (GESTimelineObject * object, + guint64 inpoint); +void ges_timeline_object_set_duration (GESTimelineObject * object, + guint64 duration); +void ges_timeline_object_set_priority (GESTimelineObject * object, + guint priority); + +void ges_timeline_object_set_layer (GESTimelineObject * object, + GESTimelineLayer * layer); + +/* TrackObject handling */ GESTrackObject * -ges_timeline_object_create_track_object (GESTimelineObject * object, - GESTrack * track); +ges_timeline_object_create_track_object (GESTimelineObject * object, + GESTrack * track); -gboolean ges_timeline_object_create_track_objects (GESTimelineObject * - object, GESTrack * track); +gboolean +ges_timeline_object_create_track_objects (GESTimelineObject * object, + GESTrack * track); gboolean ges_timeline_object_release_track_object (GESTimelineObject * object, - GESTrackObject * trackobject); + GESTrackObject * trackobject); gboolean -ges_timeline_object_fill_track_object (GESTimelineObject * object, - GESTrackObject * trackobj, - GstElement * gnlobj); +ges_timeline_object_fill_track_object (GESTimelineObject * object, + GESTrackObject * trackobj, + GstElement * gnlobj); GESTrackObject * -ges_timeline_object_find_track_object (GESTimelineObject * object, - GESTrack * track, GType type); +ges_timeline_object_find_track_object (GESTimelineObject * object, + GESTrack * track, GType type); GList * -ges_timeline_object_get_track_objects (GESTimelineObject *object); - -GESTimelineLayer * -ges_timeline_object_get_layer (GESTimelineObject *object); +ges_timeline_object_get_track_objects (GESTimelineObject *object); gboolean -ges_timeline_object_add_track_object (GESTimelineObject *object, GESTrackObject - *trobj); +ges_timeline_object_add_track_object (GESTimelineObject *object, + GESTrackObject *trobj); + +/* Layer */ +GESTimelineLayer * +ges_timeline_object_get_layer (GESTimelineObject *object); +/* Effects */ GList * -ges_timeline_object_get_top_effects (GESTimelineObject *object); +ges_timeline_object_get_top_effects (GESTimelineObject *object); gint ges_timeline_object_get_top_effect_position (GESTimelineObject *object, - GESTrackEffect *effect); + GESTrackEffect *effect); gboolean ges_timeline_object_set_top_effect_priority (GESTimelineObject *object, - GESTrackEffect *effect, guint newpriority); + GESTrackEffect *effect, + guint newpriority); G_END_DECLS diff --git a/ges/ges-timeline-parse-launch-effect.h b/ges/ges-timeline-parse-launch-effect.h index fb38243..6609963 100644 --- a/ges/ges-timeline-parse-launch-effect.h +++ b/ges/ges-timeline-parse-launch-effect.h @@ -72,8 +72,9 @@ struct _GESTimelineParseLaunchEffectClass { GType ges_timeline_parse_launch_effect_get_type (void); -GESTimelineParseLaunchEffect *ges_timeline_parse_launch_effect_new (const gchar * - video_bin_description, const gchar * audio_bin_description); +GESTimelineParseLaunchEffect * +ges_timeline_parse_launch_effect_new (const gchar * video_bin_description, + const gchar * audio_bin_description); G_END_DECLS #endif /* _GES_TIMELINE_PARSE_LAUNCH_EFFECT */ diff --git a/ges/ges-track-object.h b/ges/ges-track-object.h index 126ec4c..a30f1cd 100644 --- a/ges/ges-track-object.h +++ b/ges/ges-track-object.h @@ -97,12 +97,13 @@ struct _GESTrackObject { * GESTrackObjectClass: * @gnlobject_factorytype: name of the GNonLin GStElementFactory type to use. * @create_gnl_object: method to create the GNonLin container object. - * @get_props_hastable: method to list children properties that user could like to - * configure. - * @list_children_properties: method to get children properties that user could like to - * configure. - * The default implementation will create an object of type @gnlobject_factorytype - * and call @create_element. + * @get_props_hastable: method to list children properties that user could like + * to configure. + * @list_children_properties: method to get children properties that user could + * like to configure. + * The default implementation will create an object + * of type @gnlobject_factorytype and call + * @create_element. * @create_element: method to return the GstElement to put in the gnlobject. * @start_changed: start property of gnlobject has changed * @media_start_changed: media-start property of gnlobject has changed @@ -119,17 +120,18 @@ struct _GESTrackObjectClass { /*< public >*/ /* virtual methods for subclasses */ - const gchar *gnlobject_factorytype; - GstElement* (*create_gnl_object) (GESTrackObject * object); - GstElement* (*create_element) (GESTrackObject * object); - GHashTable* (*get_props_hastable) (GESTrackObject * object); - GParamSpec** (*list_children_properties) (GESTrackObject *object, guint *n_properties); - - void (*start_changed) (GESTrackObject *object, guint64 start); - void (*media_start_changed) (GESTrackObject *object, guint64 media_start); + const gchar *gnlobject_factorytype; + GstElement* (*create_gnl_object) (GESTrackObject * object); + GstElement* (*create_element) (GESTrackObject * object); + GHashTable* (*get_props_hastable) (GESTrackObject * object); + GParamSpec** (*list_children_properties) (GESTrackObject * object, + guint *n_properties); + + void (*start_changed) (GESTrackObject *object, guint64 start); + void (*media_start_changed) (GESTrackObject *object, guint64 media_start); void (*gnl_priority_changed) (GESTrackObject *object, guint priority); - void (*duration_changed) (GESTrackObject *object, guint64 duration); - void (*active_changed) (GESTrackObject *object, gboolean active); + void (*duration_changed) (GESTrackObject *object, guint64 duration); + void (*active_changed) (GESTrackObject *object, gboolean active); /*< private >*/ /* signals (currently unused) */ @@ -141,48 +143,66 @@ struct _GESTrackObjectClass { GType ges_track_object_get_type (void); -gboolean ges_track_object_set_track (GESTrackObject * object, GESTrack * track); +gboolean ges_track_object_set_track (GESTrackObject * object, + GESTrack * track); GESTrack* ges_track_object_get_track (GESTrackObject * object); -void ges_track_object_set_timeline_object (GESTrackObject * object, GESTimelineObject * tlobject); -GESTimelineObject * ges_track_object_get_timeline_object (GESTrackObject* object); +void ges_track_object_set_timeline_object (GESTrackObject * object, + GESTimelineObject * tlobject); +GESTimelineObject * +ges_track_object_get_timeline_object (GESTrackObject* object); GstElement * ges_track_object_get_gnlobject (GESTrackObject * object); -GstElement * ges_track_object_get_element (GESTrackObject * object); - -void ges_track_object_set_locked (GESTrackObject * object, gboolean locked); -gboolean ges_track_object_is_locked (GESTrackObject * object); - -void ges_track_object_set_start (GESTrackObject * object, guint64 start); -void ges_track_object_set_inpoint (GESTrackObject * object, guint64 inpoint); -void ges_track_object_set_duration (GESTrackObject * object, guint64 duration); -void ges_track_object_set_priority (GESTrackObject * object, guint32 priority); -gboolean ges_track_object_set_active (GESTrackObject * object, gboolean active); - -guint64 ges_track_object_get_start (GESTrackObject * object); -guint64 ges_track_object_get_inpoint (GESTrackObject * object); +GstElement * ges_track_object_get_element (GESTrackObject * object); + +void ges_track_object_set_locked (GESTrackObject * object, + gboolean locked); +gboolean ges_track_object_is_locked (GESTrackObject * object); + +void ges_track_object_set_start (GESTrackObject * object, + guint64 start); +void ges_track_object_set_inpoint (GESTrackObject * object, + guint64 inpoint); +void ges_track_object_set_duration (GESTrackObject * object, + guint64 duration); +void ges_track_object_set_priority (GESTrackObject * object, + guint32 priority); +gboolean ges_track_object_set_active (GESTrackObject * object, + gboolean active); + +guint64 ges_track_object_get_start (GESTrackObject * object); +guint64 ges_track_object_get_inpoint (GESTrackObject * object); guint64 ges_track_object_get_duration (GESTrackObject * object); guint32 ges_track_object_get_priority (GESTrackObject * object); -gboolean ges_track_object_is_active (GESTrackObject * object); +gboolean ges_track_object_is_active (GESTrackObject * object); -GParamSpec ** ges_track_object_list_children_properties (GESTrackObject *object, - guint *n_properties); -gboolean ges_track_object_lookup_child (GESTrackObject *object, - const gchar *prop_name, GstElement **element, GParamSpec **pspec); +GParamSpec ** +ges_track_object_list_children_properties (GESTrackObject *object, + guint *n_properties); +gboolean ges_track_object_lookup_child (GESTrackObject *object, + const gchar *prop_name, + GstElement **element, + GParamSpec **pspec); void ges_track_object_get_child_property_by_pspec (GESTrackObject * object, - GParamSpec * pspec, GValue * value); -void ges_track_object_get_child_property_valist (GESTrackObject * object, - const gchar * first_property_name, va_list var_args); -void ges_track_object_get_child_property (GESTrackObject *object, - const gchar * first_property_name, ...) G_GNUC_NULL_TERMINATED; + GParamSpec * pspec, + GValue * value); +void ges_track_object_get_child_property_valist (GESTrackObject * object, + const gchar * first_property_name, + va_list var_args); +void ges_track_object_get_child_property (GESTrackObject *object, + const gchar * first_property_name, + ...) G_GNUC_NULL_TERMINATED; void ges_track_object_set_child_property_valist (GESTrackObject * object, - const gchar * first_property_name, va_list var_args); + const gchar * first_property_name, + va_list var_args); void ges_track_object_set_child_property_by_pspec (GESTrackObject * object, - GParamSpec * pspec, GValue * value); + GParamSpec * pspec, + GValue * value); void ges_track_object_set_child_property (GESTrackObject * object, - const gchar * first_property_name, ...) G_GNUC_NULL_TERMINATED; + const gchar * first_property_name, + ...) G_GNUC_NULL_TERMINATED; G_END_DECLS #endif /* _GES_TRACK_OBJECT */ -- 2.7.4