diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt index 4ea9801395..0be9b28156 100644 --- a/docs/libs/ges-sections.txt +++ b/docs/libs/ges-sections.txt @@ -649,7 +649,7 @@ ges_title_clip_get_text ges_title_clip_get_font_desc ges_title_clip_get_valignment ges_title_clip_get_halignment -ges_title_clip_get_color +ges_title_clip_get_text_color ges_title_clip_get_background_color ges_title_clip_get_xpos ges_title_clip_get_ypos @@ -744,7 +744,7 @@ ges_title_source_set_text ges_title_source_set_font_desc ges_title_source_set_halignment ges_title_source_set_valignment -ges_title_source_set_color +ges_title_source_set_text_color ges_title_clip_set_background_color_color ges_title_source_set_xpos ges_title_source_set_ypos @@ -752,7 +752,7 @@ ges_title_source_get_text ges_title_source_get_font_desc ges_title_source_get_halignment ges_title_source_get_valignment -ges_title_source_get_color +ges_title_source_get_text_color ges_title_source_get_background_color ges_title_source_get_xpos ges_title_source_get_ypos diff --git a/ges/ges-title-clip.c b/ges/ges-title-clip.c index 16970b1be3..b7b54ffe62 100644 --- a/ges/ges-title-clip.c +++ b/ges/ges-title-clip.c @@ -396,7 +396,7 @@ ges_title_clip_set_color (GESTitleClip * self, guint32 color) self->priv->color = color; for (tmp = self->priv->track_titles; tmp; tmp = tmp->next) { - ges_title_source_set_color (GES_TITLE_SOURCE (tmp->data), + ges_title_source_set_text_color (GES_TITLE_SOURCE (tmp->data), self->priv->color); } } @@ -531,7 +531,7 @@ ges_title_clip_get_valignment (GESTitleClip * self) } /** - * ges_title_clip_get_color: + * ges_title_clip_get_text_color: * @self: a #GESTitleClip * * Get the color used by @self. @@ -541,7 +541,7 @@ ges_title_clip_get_valignment (GESTitleClip * self) * Since: 0.10.2 */ const guint32 -ges_title_clip_get_color (GESTitleClip * self) +ges_title_clip_get_text_color (GESTitleClip * self) { return self->priv->color; } @@ -635,7 +635,7 @@ ges_title_clip_create_track_element (GESClip * obj, GESTrackType type) ges_title_source_set_font_desc ((GESTitleSource *) res, priv->font_desc); ges_title_source_set_halignment ((GESTitleSource *) res, priv->halign); ges_title_source_set_valignment ((GESTitleSource *) res, priv->valign); - ges_title_source_set_color ((GESTitleSource *) res, priv->color); + ges_title_source_set_text_color ((GESTitleSource *) res, priv->color); ges_title_clip_set_background_color_color ((GESTitleSource *) res, priv->background); ges_title_source_set_xpos ((GESTitleSource *) res, priv->xpos); diff --git a/ges/ges-title-clip.h b/ges/ges-title-clip.h index f6dc4b0168..9fa699e77d 100644 --- a/ges/ges-title-clip.h +++ b/ges/ges-title-clip.h @@ -115,7 +115,7 @@ GESTextHAlign ges_title_clip_get_halignment (GESTitleClip * self); const guint32 -ges_title_clip_get_color (GESTitleClip * self); +ges_title_clip_get_text_color (GESTitleClip * self); const guint32 ges_title_clip_get_background_color (GESTitleClip * self); diff --git a/ges/ges-title-source.c b/ges/ges-title-source.c index 46b1d9b000..9449c6d691 100644 --- a/ges/ges-title-source.c +++ b/ges/ges-title-source.c @@ -263,7 +263,7 @@ ges_title_source_set_halignment (GESTitleSource * self, GESTextHAlign halign) } /** - * ges_title_source_set_color: + * ges_title_source_set_text_color: * @self: the #GESTitleSource* to set * @color: the color @self is being set to * @@ -272,7 +272,7 @@ ges_title_source_set_halignment (GESTitleSource * self, GESTextHAlign halign) * Since: 0.10.2 */ void -ges_title_source_set_color (GESTitleSource * self, guint32 color) +ges_title_source_set_text_color (GESTitleSource * self, guint32 color) { GST_DEBUG ("self:%p, color:%d", self, color); @@ -394,7 +394,7 @@ ges_title_source_get_valignment (GESTitleSource * source) } /** - * ges_title_source_get_color: + * ges_title_source_get_text_color: * @source: a #GESTitleSource * * Get the color used by @source. @@ -404,7 +404,7 @@ ges_title_source_get_valignment (GESTitleSource * source) * Since: 0.10.2 */ const guint32 -ges_title_source_get_color (GESTitleSource * source) +ges_title_source_get_text_color (GESTitleSource * source) { return source->priv->color; } diff --git a/ges/ges-title-source.h b/ges/ges-title-source.h index eb88065e09..ae457bbdcd 100644 --- a/ges/ges-title-source.h +++ b/ges/ges-title-source.h @@ -88,7 +88,7 @@ void ges_title_source_set_halignment (GESTitleSource *self, void ges_title_source_set_valignment (GESTitleSource *self, GESTextVAlign valign); -void ges_title_source_set_color (GESTitleSource *self, +void ges_title_source_set_text_color (GESTitleSource *self, guint32 color); void ges_title_clip_set_background_color_color (GESTitleSource *self, guint32 color); @@ -101,7 +101,7 @@ const gchar *ges_title_source_get_text (GESTitleSource *source); const gchar *ges_title_source_get_font_desc (GESTitleSource *source); GESTextHAlign ges_title_source_get_halignment (GESTitleSource *source); GESTextVAlign ges_title_source_get_valignment (GESTitleSource *source); -const guint32 ges_title_source_get_color (GESTitleSource *source); +const guint32 ges_title_source_get_text_color (GESTitleSource *source); const guint32 ges_title_source_get_background_color (GESTitleSource *source); const gdouble ges_title_source_get_xpos (GESTitleSource *source); const gdouble ges_title_source_get_ypos (GESTitleSource *source); diff --git a/tests/check/ges/titles.c b/tests/check/ges/titles.c index 7a8e257986..c8ded4ef41 100644 --- a/tests/check/ges/titles.c +++ b/tests/check/ges/titles.c @@ -161,7 +161,7 @@ GST_START_TEST (test_title_source_in_layer) g_object_get (source, "color", &color, NULL); assert_equals_int (color, 2147483647); - color = ges_title_source_get_color (GES_TITLE_SOURCE (trobj)); + color = ges_title_source_get_text_color (GES_TITLE_SOURCE (trobj)); assert_equals_int (color, 2147483647); /* test xpos */