From bf9dc34408bdbb75e710e13167cfbf354e4c086e Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Wed, 3 Sep 2014 17:30:35 +0200 Subject: this time I have itgit diff git diff git diff I think.. --- voctocore/experiments/shmsrc.py | 2 +- voctocore/lib/shmsrc.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/voctocore/experiments/shmsrc.py b/voctocore/experiments/shmsrc.py index 47d5c97..742767b 100644 --- a/voctocore/experiments/shmsrc.py +++ b/voctocore/experiments/shmsrc.py @@ -94,7 +94,7 @@ class ShmSrc(Gst.Bin): # this somehow solves parts of the multi-output-timestamping-issue # starting the 2nd src n seconds after the program started freezes it for n seconds self.shmsrc.set_start_time(0) - self.shmsrc.set_base_time(self.get_clock().get_time()) + self.shmsrc.set_base_time(self.get_parent().get_base_time()) self.shmsrc.set_state(Gst.State.PLAYING) diff --git a/voctocore/lib/shmsrc.py b/voctocore/lib/shmsrc.py index 3b7a6a4..0224386 100644 --- a/voctocore/lib/shmsrc.py +++ b/voctocore/lib/shmsrc.py @@ -98,6 +98,7 @@ class FailsafeShmSrc(Gst.Bin): def restart(self): self.log.warning('restarting ShmSrc') self.shmsrc.set_state(Gst.State.NULL) + self.shmsrc.set_base_time(self.get_parent().get_base_time()) self.shmsrc.set_state(Gst.State.PLAYING) def switch_to_goodstate(self): -- cgit v1.2.3