Merge branch 'nettime'

4 files changed, 32 insertions, 2 deletions

diff --git a/voctogui/lib/clock.py b/voctogui/lib/clock.py
new file mode 100644
index 0000000..9075bdc
--- /dev/null
+++ b/voctogui/lib/clock.py
@@ -0,0 +1,20 @@
+#!/usr/bin/python3
+import logging
+from gi.repository import Gst, GstNet
+
+__all__ = ['Clock']
+port = 9998
+
+log = logging.getLogger('Clock')
+Clock = None
+
+def obtainClock(host):
+	global log, Clock, SystemClock
+
+	log.debug('obtaining NetClientClock from host %s', host)
+	Clock = GstNet.NetClientClock.new('voctocore', host, port, 0)
+	log.debug('obtained NetClientClock from host %s: %s', host, Clock)
+
+	log.debug('waiting for NetClientClock to sync to host')
+	Clock.wait_for_sync(Gst.CLOCK_TIME_NONE)
+	log.info('successfully synced NetClientClock to host')
diff --git a/voctogui/lib/connection.py b/voctogui/lib/connection.py
index 6a9c025..6f8245f 100644
--- a/voctogui/lib/connection.py
+++ b/voctogui/lib/connection.py
@@ -7,17 +7,21 @@ from gi.repository import Gtk, GObject
 
 log = logging.getLogger('Connection')
 conn = None
+ip = None
 port = 9999
 command_queue = Queue()
 signal_handlers = {}
 
 def establish(host):
-	global conn, port, log
+	global conn, port, log, ip
 
 	log.info('establishing Connection to %s', host)
 	conn = socket.create_connection( (host, port) )
 	log.debug('Connection successful \o/')
 
+	ip = conn.getpeername()[0]
+	log.debug('Remote-IP is %s', ip)
+
 def fetchServerConfig():
 	global conn, log
 
diff --git a/voctogui/lib/videodisplay.py b/voctogui/lib/videodisplay.py
index 8ce1413..9a02658 100644
--- a/voctogui/lib/videodisplay.py
+++ b/voctogui/lib/videodisplay.py
@@ -2,6 +2,7 @@ import logging
 from gi.repository import Gst
 
 from lib.config import Config
+from lib.clock import Clock
 
 class VideoDisplay(object):
 	""" Displays a Voctomix-Video-Stream into a GtkWidget """
@@ -92,7 +93,7 @@ class VideoDisplay(object):
 			if play_audio:
 				# ts-offset=1000000000 (1s) - should keep audio & video in sync but delay by 1s
 				pipeline += """
-					alsasink sync=False
+					alsasink
 				"""
 
 			# Otherwise just trash the Audio
@@ -111,6 +112,7 @@ class VideoDisplay(object):
 
 		self.log.debug('Creating Display-Pipeline:\n%s', pipeline)
 		self.pipeline = Gst.parse_launch(pipeline)
+		self.pipeline.use_clock(Clock)
 
 		self.drawing_area.realize()
 		self.xid = self.drawing_area.get_property('window').get_xid()
diff --git a/voctogui/voctogui.py b/voctogui/voctogui.py
index 0853898..d6bf5b6 100755
--- a/voctogui/voctogui.py
+++ b/voctogui/voctogui.py
@@ -32,6 +32,7 @@ from lib.ui import Ui
 from lib.loghandler import LogHandler
 
 import lib.connection as Connection
+import lib.clock as ClockManager
 
 # main class
 class Voctogui(object):
@@ -125,6 +126,9 @@ def main():
 			Config.get('server', 'host')
 		)
 
+	# obtain network-clock
+	ClockManager.obtainClock(Connection.ip)
+
 	# switch connection to nonblocking, event-driven mode
 	Connection.enterNonblockingMode()