mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/pango/gsttextoverlay.c: Fix clockoverlay.

Browse source 
Original commit message from CVS:
2006-02-05  Julien MOUTTE  <julien@moutte.net>

* ext/pango/gsttextoverlay.c: (gst_text_overlay_finalize),
(gst_text_overlay_init), (gst_text_overlay_src_event),
(gst_text_overlay_collected): Fix clockoverlay.
This commit is contained in:
Julien Moutte 2006-02-05 17:21:23 +00:00
parent 87f3d7db00
commit 71a17077ea
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-02-05 Julien MOUTTE <julien@moutte.net>
* ext/pango/gsttextoverlay.c: (gst_text_overlay_finalize),
(gst_text_overlay_init), (gst_text_overlay_src_event),
(gst_text_overlay_collected): Fix clockoverlay.
2006-02-05 Tim-Philipp Müller <tim at centricular dot net> 2006-02-05 Tim-Philipp Müller <tim at centricular dot net>
* docs/libs/compiling.sgml: * docs/libs/compiling.sgml:

17
ext/pango/gsttextoverlay.c
View file

@ -263,7 +263,6 @@ gst_text_overlay_finalize (GObject * object)
{ {
GstTextOverlay *overlay = GST_TEXT_OVERLAY (object); GstTextOverlay *overlay = GST_TEXT_OVERLAY (object);
gst_collect_pads_stop (overlay->collect);
gst_object_unref (overlay->collect); gst_object_unref (overlay->collect);
g_free (overlay->default_text); g_free (overlay->default_text);
@ -335,8 +334,10 @@ gst_text_overlay_init (GstTextOverlay * overlay, GstTextOverlayClass * klass)
overlay->video_collect_data = gst_collect_pads_add_pad (overlay->collect, overlay->video_collect_data = gst_collect_pads_add_pad (overlay->collect,
overlay->video_sinkpad, sizeof (GstCollectData)); overlay->video_sinkpad, sizeof (GstCollectData));
overlay->text_collect_data = gst_collect_pads_add_pad (overlay->collect, if (overlay->text_sinkpad) {
overlay->text_sinkpad, sizeof (GstCollectData)); overlay->text_collect_data = gst_collect_pads_add_pad (overlay->collect,
overlay->text_sinkpad, sizeof (GstCollectData));
}
} }
static void static void
@ -513,6 +514,11 @@ gst_text_overlay_src_event (GstPad * pad, GstEvent * event)
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_SEEK: case GST_EVENT_SEEK:
/* We don't handle seek if we have not text pad */
if (!overlay->text_sinkpad) {
ret = gst_pad_push_event (overlay->video_sinkpad, event);
goto beach;
}
GST_DEBUG_OBJECT (overlay, "seek received, driving from here"); GST_DEBUG_OBJECT (overlay, "seek received, driving from here");
@ -554,9 +560,12 @@ gst_text_overlay_src_event (GstPad * pad, GstEvent * event)
default: default:
gst_event_ref (event); gst_event_ref (event);
ret = gst_pad_push_event (overlay->video_sinkpad, event); ret = gst_pad_push_event (overlay->video_sinkpad, event);
ret = gst_pad_push_event (overlay->text_sinkpad, event); if (overlay->text_sinkpad) {
ret = gst_pad_push_event (overlay->text_sinkpad, event);
}
} }
beach:
gst_object_unref (overlay); gst_object_unref (overlay);
return ret; return ret;