diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt index f539949344..32a0e36356 100644 --- a/docs/libs/ges-sections.txt +++ b/docs/libs/ges-sections.txt @@ -331,8 +331,9 @@ GES_TIMELINE_TITLE_SOURCE_GET_CLASS
ges-track-video-background-source GESTrackVideoBackgroundSource -GESTrackAudioBackgroundSource -GESTrackAudioBackgroundSourceClass +GESTrackVideoBackgroundSource +GESTrackVideoBackgroundSourceClass +GESTrackVideoBgSrcPattern ges_track_video_background_source_new ges_track_vbg_src_get_type @@ -376,18 +377,11 @@ GES_TRACK_TITLE_SOURCE_GET_CLASS GES_TYPE_TRACK_TITLE_SOURCE
-
-ges-track-video-background-source -GESTrackVideoBackgroundSource -GESTrackVideoBackgroundSource -GESTrackVideoBackgroundSourceClass -GESTrackVideoBgSrcPattern - -
-
ges-track-audio-background-source GESTrackAudioBackgroundSource +GESTrackAudioBackgroundSource +GESTrackAudioBackgroundSourceClass ges_track_audio_background_source_new ges_track_abg_src_get_type ges_track_video_title_source_new diff --git a/ges/ges-timeline-background-source.c b/ges/ges-timeline-background-source.c index 1125ee8574..42cd7f8bca 100644 --- a/ges/ges-timeline-background-source.c +++ b/ges/ges-timeline-background-source.c @@ -19,7 +19,7 @@ */ /** - * SECTION:ges-timeline-backgroundsource + * SECTION:ges-timeline-background-source * @short_description: An object for manipulating media files in a GESTimeline * * Represents all the output treams from a particular uri. It is assumed that diff --git a/ges/ges-timeline-background-source.h b/ges/ges-timeline-background-source.h index d616f59fa3..68a04e4c3a 100644 --- a/ges/ges-timeline-background-source.h +++ b/ges/ges-timeline-background-source.h @@ -46,15 +46,16 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_BACKGROUND_SOURCE, GESTimelineBackgroundSourceClass)) /** - * GESTimelineSource: + * GESTimelineBackgroundSource: + * @parent: parent * */ struct _GESTimelineBackgroundSource { GESTimelineSource parent; - gboolean mute; /*< private >*/ + gboolean mute; gint vpattern; }; diff --git a/ges/ges-timeline-title-source.c b/ges/ges-timeline-title-source.c index cc97a5702e..a0597a9a67 100644 --- a/ges/ges-timeline-title-source.c +++ b/ges/ges-timeline-title-source.c @@ -19,7 +19,7 @@ */ /** - * SECTION:ges-timeline-titlesource + * SECTION:ges-timeline-title-source * @short_description: An object for manipulating media files in a GESTimeline * * Represents all the output treams from a particular uri. It is assumed that diff --git a/ges/ges-timeline-title-source.h b/ges/ges-timeline-title-source.h index 60121467c3..e585d29909 100644 --- a/ges/ges-timeline-title-source.h +++ b/ges/ges-timeline-title-source.h @@ -46,7 +46,8 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TIMELINE_TITLE_SOURCE, GESTimelineTitleSourceClass)) /** - * GESTimelineSource: + * GESTimelineTitleSource: + * @parent: parent * */ diff --git a/ges/ges-timeline-transition.c b/ges/ges-timeline-transition.c index 11049a896f..e486c173ff 100644 --- a/ges/ges-timeline-transition.c +++ b/ges/ges-timeline-transition.c @@ -120,7 +120,7 @@ ges_timeline_transition_class_init (GESTimelineTransitionClass * klass) object_class->finalize = ges_timeline_transition_finalize; /** - * GESTimelineTransition: vtype + * GESTimelineTransition:vtype * * The SMPTE wipe to use, or 0 for crossfade. */ diff --git a/ges/ges-track-audio-background-source.c b/ges/ges-track-audio-background-source.c index 4a2509fb3c..f5b921bb02 100644 --- a/ges/ges-track-audio-background-source.c +++ b/ges/ges-track-audio-background-source.c @@ -19,7 +19,7 @@ */ /** - * SECTION:ges-track-source + * SECTION:ges-track-audio-background-source * @short_description: Base Class for single-media sources */ diff --git a/ges/ges-track-audio-background-source.h b/ges/ges-track-audio-background-source.h index 5fd87f1ed4..bea8008938 100644 --- a/ges/ges-track-audio-background-source.h +++ b/ges/ges-track-audio-background-source.h @@ -43,11 +43,13 @@ G_BEGIN_DECLS #define GES_TRACK_AUDIO_BACKGROUND_SOURCE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_AUDIO_BACKGROUND_SOURCE, GESTrackAudioBackgroundSourceClass)) + /** * GESTrackAudioBackgroundSource: - * @uri: #gchar *, the URI of the media audio_background to play + * @parent: parent * */ + struct _GESTrackAudioBackgroundSource { GESTrackBackgroundSource parent; @@ -57,12 +59,13 @@ struct _GESTrackAudioBackgroundSource { /** * GESTrackAudioBackgroundSourceClass: * @parent_class: parent class + * */ struct _GESTrackAudioBackgroundSourceClass { GESTrackBackgroundSourceClass parent_class; - /* */ + /*< public >*/ }; GType ges_track_abg_src_get_type (void); diff --git a/ges/ges-track-background-source.c b/ges/ges-track-background-source.c index d785e0af96..111c5e5677 100644 --- a/ges/ges-track-background-source.c +++ b/ges/ges-track-background-source.c @@ -19,8 +19,8 @@ */ /** - * SECTION:ges-track-source - * @short_description: Base Class for single-media sources + * SECTION:ges-track-background-source + * @short_description: Base Class for background source track objects */ #include "ges-internal.h" diff --git a/ges/ges-track-background-source.h b/ges/ges-track-background-source.h index c66f349a34..3ad4663b56 100644 --- a/ges/ges-track-background-source.h +++ b/ges/ges-track-background-source.h @@ -46,13 +46,13 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_BACKGROUND_SOURCE, GESTrackBackgroundSourceClass)) /** * GESTrackBackgroundSource: - * @uri: #gchar *, the URI of the media file to play + * @parent: parent * */ struct _GESTrackBackgroundSource { GESTrackSource parent; - /*< public >*/ + /*< private >*/ GstElement *element; }; @@ -64,7 +64,7 @@ struct _GESTrackBackgroundSource { struct _GESTrackBackgroundSourceClass { GESTrackSourceClass parent_class; - /* */ + /*< public >*/ GstElement* (*create_element) (GESTrackBackgroundSource *obj); }; diff --git a/ges/ges-track-title-source.c b/ges/ges-track-title-source.c index 7db095c15b..2bbe8a05c2 100644 --- a/ges/ges-track-title-source.c +++ b/ges/ges-track-title-source.c @@ -19,7 +19,7 @@ */ /** - * SECTION:ges-track-source + * SECTION:ges-track-title-source * @short_description: Base Class for single-media sources */ diff --git a/ges/ges-track-title-source.h b/ges/ges-track-title-source.h index a7218996e3..f3e99105f4 100644 --- a/ges/ges-track-title-source.h +++ b/ges/ges-track-title-source.h @@ -46,7 +46,7 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_TITLE_SOURCE, GESTrackTitleSourceClass)) /** * GESTrackTitleSource: - * @uri: #gchar *, the URI of the media file to play + * @parent: parent * */ struct _GESTrackTitleSource { diff --git a/ges/ges-track-video-background-source.c b/ges/ges-track-video-background-source.c index 5e20e2100e..7b1389155f 100644 --- a/ges/ges-track-video-background-source.c +++ b/ges/ges-track-video-background-source.c @@ -19,8 +19,8 @@ */ /** - * SECTION:ges-track-source - * @short_description: Base Class for single-media sources + * SECTION:ges-track-video-background-source + * @short_description: implements solid colors and patterns with videotestsrc */ #include "ges-internal.h" diff --git a/ges/ges-track-video-background-source.h b/ges/ges-track-video-background-source.h index 2aa1970c1f..3c76fdf018 100644 --- a/ges/ges-track-video-background-source.h +++ b/ges/ges-track-video-background-source.h @@ -44,6 +44,26 @@ G_BEGIN_DECLS #define GES_TRACK_VIDEO_BACKGROUND_SOURCE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_TRACK_VIDEO_BACKGROUND_SOURCE, GESTrackVideoBackgroundSourceClass)) +/**$ + * GESTrackVideoBgSrcPattern:$ + * @GES_TRACK_VIDEO_BG_SRC_SMPTE: A standard SMPTE test pattern$ + * @GES_TRACK_VIDEO_BG_SRC_SNOW: Random noise$ + * @GES_TRACK_VIDEO_BG_SRC_BLACK: A black image$ + * @GES_TRACK_VIDEO_BG_SRC_WHITE: A white image$ + * @GES_TRACK_VIDEO_BG_SRC_RED: A red image$ + * @GES_TRACK_VIDEO_BG_SRC_GREEN: A green image$ + * @GES_TRACK_VIDEO_BG_SRC_BLUE: A blue image$ + * @GES_TRACK_VIDEO_BG_SRC_CHECKERS1: Checkers pattern (1px)$ + * @GES_TRACK_VIDEO_BG_SRC_CHECKERS2: Checkers pattern (2px)$ + * @GES_TRACK_VIDEO_BG_SRC_CHECKERS4: Checkers pattern (4px)$ + * @GES_TRACK_VIDEO_BG_SRC_CHECKERS8: Checkers pattern (8px)$ + * @GES_TRACK_VIDEO_BG_SRC_CIRCULAR: Circular pattern$ + * @GES_TRACK_VIDEO_BG_SRC_BLINK: Alternate between black and white$ + * @GES_TRACK_VIDEO_BG_SRC_SMPTE75: SMPTE test pattern (75% color bars)$ + * + */ + + typedef enum { GES_TRACK_VIDEO_BG_SRC_SMPTE, GES_TRACK_VIDEO_BG_SRC_SNOW, @@ -63,8 +83,7 @@ typedef enum { /** * GESTrackVideoBackgroundSource: - * @uri: #gchar *, the URI of the media video_background to play - * + * @parent: parent */ struct _GESTrackVideoBackgroundSource { GESTrackBackgroundSource parent;