sys/winks/gstksclock.c (gst_ks_clock_worker_thread_func, gst_ks_clock_start):

Original commit message from CVS:
* sys/winks/gstksclock.c (gst_ks_clock_worker_thread_func,
gst_ks_clock_start):
Synchronize KS clock as a single-shot operation for now, there's not
much point in doing it periodically until we're actually using the
KS timestamps for anything else than just discarding old frames.
* sys/winks/gstksvideosrc.c (gst_ks_video_src_open_device):
Provide the GstClock when opening the device if we already have one.

1 files changed, 6 insertions, 4 deletions

diff --git a/sys/winks/gstksvideosrc.c b/sys/winks/gstksvideosrc.c
index 9e8560ce..ed191622 100644
--- a/sys/winks/gstksvideosrc.c
+++ b/sys/winks/gstksvideosrc.c
@@ -414,14 +414,16 @@ gst_ks_video_src_open_device (GstKsVideoSrc * self)
 
     if (match) {
       priv->ksclock = g_object_new (GST_TYPE_KS_CLOCK, NULL);
-      if (priv->ksclock != NULL && !gst_ks_clock_open (priv->ksclock)) {
+      if (priv->ksclock != NULL && gst_ks_clock_open (priv->ksclock)) {
+        GstClock *clock = GST_ELEMENT_CLOCK (self);
+        if (clock != NULL)
+          gst_ks_clock_provide_master_clock (priv->ksclock, clock);
+      } else {
+        GST_WARNING_OBJECT (self, "failed to create/open KsClock");
         g_object_unref (priv->ksclock);
         priv->ksclock = NULL;
       }
 
-      if (priv->ksclock == NULL)
-        GST_WARNING_OBJECT (self, "Failed to create/open KsClock");
-
       device = g_object_new (GST_TYPE_KS_VIDEO_DEVICE,
           "clock", priv->ksclock, "device-path", entry->path, NULL);
     }