From bbbdbc38bae18fc09838e7fa03c9f8a7aab24213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 14 Apr 2008 17:58:19 +0000 Subject: [PATCH] ext/pango/gsttextoverlay.c: Fix textoverlay unit test again by making the supposed default value for the wait-text pr... Original commit message from CVS: * ext/pango/gsttextoverlay.c: (gst_text_overlay_class_init), (gst_text_overlay_init): Fix textoverlay unit test again by making the supposed default value for the wait-text property the actual default value. Also fix Since: tag for new property. --- ChangeLog | 8 ++++++++ common | 2 +- ext/pango/gsttextoverlay.c | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e197163f8..0d4c9d4ad4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-04-14 Tim-Philipp Müller + + * ext/pango/gsttextoverlay.c: (gst_text_overlay_class_init), + (gst_text_overlay_init): + Fix textoverlay unit test again by making the supposed default + value for the wait-text property the actual default value. + Also fix Since: tag for new property. + 2008-04-11 Tim-Philipp Müller * gst-libs/gst/video/video.c: (gst_video_format_new_caps), diff --git a/common b/common index d3ace35f57..f88ff852da 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit d3ace35f57dd196a3e83a0a48f1350ca32db8e39 +Subproject commit f88ff852da7631ad2d0be835763da6d551a63883 diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c index daff89c4f5..a64c1fb01f 100644 --- a/ext/pango/gsttextoverlay.c +++ b/ext/pango/gsttextoverlay.c @@ -417,7 +417,7 @@ gst_text_overlay_class_init (GstTextOverlayClass * klass) * If video and subtitles are sent in sync, like from the same demuxer, this * property should be set. * - * Since: 0.10.19 + * Since: 0.10.20 **/ g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_WAIT_TEXT, g_param_spec_boolean ("wait-text", "Wait Text", @@ -522,6 +522,7 @@ gst_text_overlay_init (GstTextOverlay * overlay, GstTextOverlayClass * klass) overlay->want_shading = DEFAULT_PROP_SHADING; overlay->shading_value = DEFAULT_SHADING_VALUE; overlay->silent = DEFAULT_PROP_SILENT; + overlay->wait_text = DEFAULT_PROP_WAIT_TEXT; overlay->default_text = g_strdup (DEFAULT_PROP_TEXT); overlay->need_render = TRUE;