From 1c6f5182160dbf1f627a566fe7124aa5d6baf9ba Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Wed, 7 Feb 2018 09:11:17 +0100 Subject: [PATCH] fix wrong calculation --- ffplayout.conf | 3 +++ ffplayout.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ffplayout.conf b/ffplayout.conf index 6dd26c72..fa14939e 100644 --- a/ffplayout.conf +++ b/ffplayout.conf @@ -61,9 +61,12 @@ a_sample = 44100 # playlist format is smil xml # day_start means at witch hour starts the day, as integer +# filler_path and filler_clip are for the GUI only at the moment [PLAYLIST] playlist_path = /playlists clips_root = /ADtvMedia +filler_path = /ADtvMedia/ADtv/03 - Musikalische Lückenfüller +filler_clip = /ADtvMedia/ADtv/01 - Intro/seperator.clock.5-00.mp4 day_start = 6 diff --git a/ffplayout.py b/ffplayout.py index 84218add..e48c5118 100755 --- a/ffplayout.py +++ b/ffplayout.py @@ -313,6 +313,7 @@ def iter_src_commands(): if time_in_buffer > float(_buffer.length): # wait to sync time wait = time_in_buffer - float(_buffer.length) + logger.info('Wait for: ' + wait + ' seconds.') sleep(wait) list_date = get_date(False) last_out = False @@ -363,7 +364,7 @@ def iter_src_commands(): else: add_sec = 0 # calculate real time in buffer - time_in_buffer = last_time - get_time('full_sec') + add_sec + time_in_buffer = last_time - get_time('full_sec') - add_sec begin = float(_playlist.start * 3600 - 5) src_cmd = prepare_last_clip(clip_nodes[-1]) last_time = begin