8 files changed, 22 insertions, 12 deletions
diff --git a/gst/playondemand/gstplayondemand.c b/gst/playondemand/gstplayondemand.c
index eeffdc99a..353f3e82f 100644
--- a/gst/playondemand/gstplayondemand.c
+++ b/gst/playondemand/gstplayondemand.c
@@ -71,7 +71,7 @@ static void play_on_demand_finalize (GObject * object);
 static GstPadLinkReturn play_on_demand_pad_link (GstPad * pad,
     const GstCaps * caps);
 static void play_on_demand_loop (GstElement * elem);
-static void play_on_demand_set_clock (GstElement * elem, GstClock * clock);
+static gboolean play_on_demand_set_clock (GstElement * elem, GstClock * clock);
 
 /* signal handlers */
 static void play_on_demand_play_handler (GstElement * elem);
@@ -463,7 +463,7 @@ play_on_demand_loop (GstElement * elem)
   }
 }
 
-static void
+static gboolean
 play_on_demand_set_clock (GstElement * elem, GstClock * clock)
 {
   GstPlayOnDemand *filter;
@@ -473,6 +473,8 @@ play_on_demand_set_clock (GstElement * elem, GstClock * clock)
   filter = GST_PLAYONDEMAND (elem);
 
   filter->clock = clock;
+
+  return GST_ELEMENT_CLASS (parent_class)->set_clock (elem, clock);
 }
 
 static void
diff --git a/sys/decklink/gstdecklinksink.cpp b/sys/decklink/gstdecklinksink.cpp
index 9948048bd..922419774 100644
--- a/sys/decklink/gstdecklinksink.cpp
+++ b/sys/decklink/gstdecklinksink.cpp
@@ -546,7 +546,7 @@ static gboolean
 gst_decklink_sink_set_clock (GstElement * element, GstClock * clock)
 {
 
-  return TRUE;
+  return GST_ELEMENT_CLASS (parent_class)->set_clock (element, clock);
 }
 
 static GstIndex *
diff --git a/sys/decklink/gstdecklinksrc.cpp b/sys/decklink/gstdecklinksrc.cpp
index 1e44a3c38..61b546ede 100644
--- a/sys/decklink/gstdecklinksrc.cpp
+++ b/sys/decklink/gstdecklinksrc.cpp
@@ -728,7 +728,7 @@ static gboolean
 gst_decklink_src_set_clock (GstElement * element, GstClock * clock)
 {
 
-  return TRUE;
+  return GST_ELEMENT_CLASS (parent_class)->set_clock (element, clock);
 }
 
 static GstIndex *
diff --git a/sys/dxr3/dxr3audiosink.c b/sys/dxr3/dxr3audiosink.c
index d7bd6881d..53a69636a 100644
--- a/sys/dxr3/dxr3audiosink.c
+++ b/sys/dxr3/dxr3audiosink.c
@@ -93,7 +93,8 @@ static gboolean dxr3audiosink_open (Dxr3AudioSink * sink);
 static gboolean dxr3audiosink_set_mode_pcm (Dxr3AudioSink * sink);
 static gboolean dxr3audiosink_set_mode_ac3 (Dxr3AudioSink * sink);
 static void dxr3audiosink_close (Dxr3AudioSink * sink);
-static void dxr3audiosink_set_clock (GstElement * element, GstClock * clock);
+static gboolean dxr3audiosink_set_clock (GstElement * element,
+    GstClock * clock);
 
 static GstPadLinkReturn dxr3audiosink_pcm_sinklink (GstPad * pad,
     const GstCaps * caps);
@@ -440,12 +441,14 @@ dxr3audiosink_close (Dxr3AudioSink * sink)
 }
 
 
-static void
+static gboolean
 dxr3audiosink_set_clock (GstElement * element, GstClock * clock)
 {
   Dxr3AudioSink *src = DXR3AUDIOSINK (element);
 
   src->clock = clock;
+
+  return GST_ELEMENT_CLASS (parent_class)->set_clock (element, clock);
 }
 
 
diff --git a/sys/dxr3/dxr3spusink.c b/sys/dxr3/dxr3spusink.c
index 0ea924390..ec713fbb4 100644
--- a/sys/dxr3/dxr3spusink.c
+++ b/sys/dxr3/dxr3spusink.c
@@ -72,7 +72,7 @@ static void dxr3spusink_get_property (GObject * object,
 
 static gboolean dxr3spusink_open (Dxr3SpuSink * sink);
 static void dxr3spusink_close (Dxr3SpuSink * sink);
-static void dxr3spusink_set_clock (GstElement * element, GstClock * clock);
+static gboolean dxr3spusink_set_clock (GstElement * element, GstClock * clock);
 
 static gboolean dxr3spusink_handle_event (GstPad * pad, GstEvent * event);
 static void dxr3spusink_chain (GstPad * pad, GstData * _data);
@@ -305,12 +305,14 @@ dxr3spusink_close (Dxr3SpuSink * sink)
 }
 
 
-static void
+static gboolean
 dxr3spusink_set_clock (GstElement * element, GstClock * clock)
 {
   Dxr3SpuSink *src = DXR3SPUSINK (element);
 
   src->clock = clock;
+
+  return GST_ELEMENT_CLASS (element)->set_clock (element, clock);
 }
 
 
diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c
index 2f86f0681..1c69295ab 100644
--- a/sys/dxr3/dxr3videosink.c
+++ b/sys/dxr3/dxr3videosink.c
@@ -96,7 +96,8 @@ static void dxr3videosink_get_property (GObject * object,
 
 static gboolean dxr3videosink_open (Dxr3VideoSink * sink);
 static void dxr3videosink_close (Dxr3VideoSink * sink);
-static void dxr3videosink_set_clock (GstElement * element, GstClock * clock);
+static gboolean dxr3videosink_set_clock (GstElement * element,
+    GstClock * clock);
 
 static void dxr3videosink_reset_parser (Dxr3VideoSink * sink);
 static int dxr3videosink_next_start_code (Dxr3VideoSink * sink);
@@ -308,12 +309,14 @@ dxr3videosink_close (Dxr3VideoSink * sink)
 }
 
 
-static void
+static gboolean
 dxr3videosink_set_clock (GstElement * element, GstClock * clock)
 {
   Dxr3VideoSink *src = DXR3VIDEOSINK (element);
 
   src->clock = clock;
+
+  return GST_ELEMENT_CLASS (parent_class)->set_clock (element, clock);
 }
 
 
diff --git a/sys/winks/gstksvideosrc.c b/sys/winks/gstksvideosrc.c
index 577bef5e6..897ff0c34 100644
--- a/sys/winks/gstksvideosrc.c
+++ b/sys/winks/gstksvideosrc.c
@@ -753,7 +753,7 @@ gst_ks_video_src_set_clock (GstElement * element, GstClock * clock)
     gst_ks_clock_provide_master_clock (priv->ksclock, clock);
   GST_OBJECT_UNLOCK (element);
 
-  return TRUE;
+  return GST_ELEMENT_CLASS (element)->set_clock (element, clock);
 }
 
 static GstCaps *
diff --git a/tools/element-templates/element b/tools/element-templates/element
index ed025ee2b..001f48762 100644
--- a/tools/element-templates/element
+++ b/tools/element-templates/element
@@ -97,7 +97,7 @@ static gboolean
 gst_replace_set_clock (GstElement * element, GstClock * clock)
 {
 
-  return TRUE;
+  return GST_ELEMENT_CLASS (parent_class)->set_clock (element, clock);
 }
 
 static GstIndex *