From 5e5f93ce4ad6c1f91d74790919dc55e083f28e74 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Tue, 9 Nov 2004 13:03:33 +0000 Subject: [PATCH] Let VideoSink store the clock, since Cacasink inherits from there Original commit message from CVS: Let VideoSink store the clock, since Cacasink inherits from there --- ChangeLog | 7 +++++++ ext/libcaca/gstcacasink.c | 15 +-------------- ext/libcaca/gstcacasink.h | 2 -- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc16941..c204c3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-11-09 Jan Schmidt + + * ext/libcaca/gstcacasink.c: (gst_cacasink_class_init), + (gst_cacasink_init), (gst_cacasink_chain): + * ext/libcaca/gstcacasink.h: + Cacasink inherits from VideoSink, so let that store the clock. + 2004-11-09 Wim Taymans * gst/playback/README: diff --git a/ext/libcaca/gstcacasink.c b/ext/libcaca/gstcacasink.c index fc91069..a9ac527 100644 --- a/ext/libcaca/gstcacasink.c +++ b/ext/libcaca/gstcacasink.c @@ -62,7 +62,6 @@ static void gst_cacasink_base_init (gpointer g_class); static void gst_cacasink_class_init (GstCACASinkClass * klass); static void gst_cacasink_init (GstCACASink * cacasink); static void gst_cacasink_interface_init (GstImplementsInterfaceClass * klass); -static void gst_cacasink_set_clock (GstElement * element, GstClock * clock); static gboolean gst_cacasink_interface_supported (GstImplementsInterface * iface, GType type); static void gst_cacasink_navigation_init (GstNavigationInterface * iface); @@ -190,8 +189,6 @@ gst_cacasink_class_init (GstCACASinkClass * klass) gobject_class->get_property = gst_cacasink_get_property; gstelement_class->change_state = gst_cacasink_change_state; - - gstelement_class->set_clock = gst_cacasink_set_clock; } static void @@ -291,14 +288,6 @@ gst_cacasink_sinkconnect (GstPad * pad, const GstCaps * caps) } static void -gst_cacasink_set_clock (GstElement * element, GstClock * clock) -{ - GstCACASink *cacasink = GST_CACASINK (element); - - cacasink->clock = clock; -} - -static void gst_cacasink_init (GstCACASink * cacasink) { GST_VIDEOSINK_PAD (cacasink) = @@ -316,8 +305,6 @@ gst_cacasink_init (GstCACASink * cacasink) cacasink->green_mask = GST_CACA_DEFAULT_GREEN_MASK; cacasink->blue_mask = GST_CACA_DEFAULT_BLUE_MASK; - cacasink->clock = NULL; - GST_FLAG_SET (cacasink, GST_ELEMENT_THREAD_SUGGESTED); } @@ -339,7 +326,7 @@ gst_cacasink_chain (GstPad * pad, GstData * _data) GST_DEBUG ("videosink: clock wait: %" G_GUINT64_FORMAT, GST_BUFFER_TIMESTAMP (buf)); - if (cacasink->clock && GST_BUFFER_TIMESTAMP_IS_VALID (buf)) { + if (GST_VIDEOSINK_CLOCK (cacasink) && GST_BUFFER_TIMESTAMP_IS_VALID (buf)) { gst_element_wait (GST_ELEMENT (cacasink), GST_BUFFER_TIMESTAMP (buf)); } diff --git a/ext/libcaca/gstcacasink.h b/ext/libcaca/gstcacasink.h index 3eaef40..c253eac 100644 --- a/ext/libcaca/gstcacasink.h +++ b/ext/libcaca/gstcacasink.h @@ -74,8 +74,6 @@ struct _GstCACASink { gboolean antialiasing; guint red_mask, green_mask, blue_mask; - GstClock *clock; - struct caca_bitmap *bitmap; }; -- 2.7.4