clip: Reindent header and make ges_clip_set_layer internal

This commit is contained in:
Thibault Saunier 2013-03-15 11:58:59 -03:00
parent 2fede3adeb
commit 058f0d0099
3 changed files with 49 additions and 42 deletions

View file

@ -402,7 +402,6 @@ ges_clip_create_track_elements
ges_clip_create_track_element ges_clip_create_track_element
ges_clip_fill_track_element ges_clip_fill_track_element
ges_clip_is_moving_from_layer ges_clip_is_moving_from_layer
ges_clip_set_layer
ges_clip_set_moving_from_layer ges_clip_set_moving_from_layer
GESClipPrivate GESClipPrivate
GES_IS_CLIP GES_IS_CLIP

View file

@ -53,9 +53,8 @@ typedef struct _GESClipPrivate GESClipPrivate;
* *
* Returns: TRUE if the implementer succesfully filled the @gnlobj, else #FALSE. * Returns: TRUE if the implementer succesfully filled the @gnlobj, else #FALSE.
*/ */
typedef gboolean (*GESFillTrackElementFunc) (GESClip *clip, typedef gboolean (*GESFillTrackElementFunc) (GESClip *clip, GESTrackElement *track_element,
GESTrackElement *track_element, GstElement *gnlobj);
GstElement *gnlobj);
/** /**
* GESCreateTrackElementFunc: * GESCreateTrackElementFunc:
@ -80,8 +79,7 @@ typedef gboolean (*GESFillTrackElementFunc) (GESClip *clip,
* Returns: the #GESTrackElement to be used, or %NULL if it can't provide one * Returns: the #GESTrackElement to be used, or %NULL if it can't provide one
* for the given @track. * for the given @track.
*/ */
typedef GESTrackElement *(*GESCreateTrackElementFunc) (GESClip * clip, typedef GESTrackElement *(*GESCreateTrackElementFunc) (GESClip * clip, GESTrackType type);
GESTrackType type);
/** /**
* GESCreateTrackElementsFunc: * GESCreateTrackElementsFunc:
@ -105,13 +103,13 @@ typedef GList * (*GESCreateTrackElementsFunc) (GESClip * clip, GESTrackType type
*/ */
struct _GESClip struct _GESClip
{ {
GESContainer parent; GESContainer parent;
/*< private >*/ /*< private >*/
GESClipPrivate *priv; GESClipPrivate *priv;
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING_LARGE]; gpointer _ges_reserved[GES_PADDING_LARGE];
}; };
/** /**
@ -127,54 +125,60 @@ struct _GESClip
struct _GESClipClass struct _GESClipClass
{ {
/*< private > */ /*< private > */
GESContainerClass parent_class; GESContainerClass parent_class;
/*< public > */ /*< public > */
GESCreateTrackElementFunc create_track_element; GESCreateTrackElementFunc create_track_element;
GESCreateTrackElementsFunc create_track_elements; GESCreateTrackElementsFunc create_track_elements;
GESFillTrackElementFunc fill_track_element;
/* FIXME : might need a release_track_element */ gboolean need_fill_track;
GESFillTrackElementFunc fill_track_element;
gboolean need_fill_track;
/*< private >*/ /*< private >*/
/* Padding for API extension */ /* Padding for API extension */
gpointer _ges_reserved[GES_PADDING_LARGE]; gpointer _ges_reserved[GES_PADDING_LARGE];
}; };
/****************************************************
* Standard *
****************************************************/
GType ges_clip_get_type (void); GType ges_clip_get_type (void);
/* Setters */ /****************************************************
void ges_clip_set_layer (GESClip *clip, * TrackElement handling *
GESTimelineLayer *layer); ****************************************************/
GESTrackType ges_clip_get_supported_formats (GESClip *clip);
GESTrackElement* ges_clip_create_track_element (GESClip *clip, GESTrackType type);
GList* ges_clip_create_track_elements (GESClip *clip, GESTrackType type);
void ges_clip_set_supported_formats (GESClip *clip, GESTrackType supportedformats);
gboolean ges_clip_add_asset (GESClip *clip, GESAsset *asset);
gboolean ges_clip_fill_track_element (GESClip *clip, GESTrackElement *trackelement,
GstElement *gnlobj);
GESTrackElement* ges_clip_find_track_element (GESClip *clip, GESTrack *track,
GType type);
/* TrackElement handling */ /****************************************************
GESTrackType ges_clip_get_supported_formats (GESClip *clip); * Layer *
GESTrackElement *ges_clip_create_track_element (GESClip *clip, GESTrackType type); ****************************************************/
GList * ges_clip_create_track_elements (GESClip *clip, GESTrackType type); GESTimelineLayer* ges_clip_get_layer (GESClip *clip);
void ges_clip_set_supported_formats (GESClip *clip, GESTrackType supportedformats); gboolean ges_clip_is_moving_from_layer (GESClip *clip);
gboolean ges_clip_move_to_layer (GESClip *clip, GESTimelineLayer *layer);
void ges_clip_set_moving_from_layer (GESClip *clip, gboolean is_moving);
gboolean ges_clip_add_asset (GESClip *clip, GESAsset *asset); /****************************************************
gboolean ges_clip_fill_track_element (GESClip *clip, GESTrackElement *trackelement, GstElement *gnlobj); * Effects *
GESTrackElement *ges_clip_find_track_element (GESClip *clip, GESTrack *track, GType type); ****************************************************/
GList* ges_clip_get_top_effects (GESClip *clip);
gint ges_clip_get_top_effect_position (GESClip *clip, GESBaseEffect *effect);
gboolean ges_clip_set_top_effect_priority (GESClip *clip, GESBaseEffect *effect,
guint newpriority);
/* Layer */ /****************************************************
GESTimelineLayer *ges_clip_get_layer (GESClip *clip); * Editing *
gboolean ges_clip_is_moving_from_layer (GESClip *clip); ****************************************************/
gboolean ges_clip_move_to_layer (GESClip *clip, GESTimelineLayer *layer); GESClip* ges_clip_split (GESClip *clip, guint64 position);
void ges_clip_set_moving_from_layer (GESClip *clip, gboolean is_moving); gboolean ges_clip_edit (GESClip *clip, GList *layers,
gint new_layer_priority, GESEditMode mode,
/* Effects */ GESEdge edge, guint64 position);
GList* ges_clip_get_top_effects (GESClip *clip);
gint ges_clip_get_top_effect_position (GESClip *clip, GESBaseEffect *effect);
gboolean ges_clip_set_top_effect_priority (GESClip *clip, GESBaseEffect *effect, guint newpriority);
/* Editing */
GESClip *ges_clip_split (GESClip *clip, guint64 position);
gboolean ges_clip_edit (GESClip *clip, GList *layers,
gint new_layer_priority, GESEditMode mode,
GESEdge edge, guint64 position);
G_END_DECLS G_END_DECLS
#endif /* _GES_CLIP */ #endif /* _GES_CLIP */

View file

@ -232,5 +232,9 @@ G_GNUC_INTERNAL void _ges_container_sort_children (GESContainer *container
G_GNUC_INTERNAL void _ges_container_set_ignore_notifies (GESContainer *container, G_GNUC_INTERNAL void _ges_container_set_ignore_notifies (GESContainer *container,
gboolean ignore_notifies); gboolean ignore_notifies);
/****************************************************
* GESClip *
****************************************************/
void ges_clip_set_layer (GESClip *clip, GESTimelineLayer *layer);
#endif /* __GES_INTERNAL_H__ */ #endif /* __GES_INTERNAL_H__ */