From 172f8ce6c23c86c5217df9ba714d087cdd895bea Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Wed, 15 Aug 2018 15:29:42 +0200 Subject: [PATCH] literal_eval for map_extension, change time_shift value --- ffplayout.conf | 2 +- ffplayout.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ffplayout.conf b/ffplayout.conf index 0c69e674..9068b9f5 100644 --- a/ffplayout.conf +++ b/ffplayout.conf @@ -78,7 +78,7 @@ filler_path = /ADtvMedia/ADtv/03 - Musikalische Lückenfüller filler_clip = /ADtvMedia/ADtv/01 - Intro/seperator.clock.5-00.mp4 blackclip = /opt/dummy20.mkv day_start = 6 -time_shift = -25 +time_shift = -35 map_extension = # buffer settings diff --git a/ffplayout.py b/ffplayout.py index ab1235fd..68d6d55d 100755 --- a/ffplayout.py +++ b/ffplayout.py @@ -415,8 +415,9 @@ def validate_thread(clip_nodes): # check if all values are valid for xml_node in xml_nodes: if _playlist.map_ext: + _ext = literal_eval(_playlist.map_ext) node_src = xml_node.get('src').replace( - _playlist.map_ext[0], _playlist.map_ext[1]) + _ext[0], _ext[1]) else: node_src = xml_node.get('src') @@ -518,8 +519,9 @@ def iter_src_commands(): # loop through all clips in playlist for clip_node in clip_nodes: if _playlist.map_ext: + _ext = literal_eval(_playlist.map_ext) node_src = clip_node.get('src').replace( - _playlist.map_ext[0], _playlist.map_ext[1]) + _ext[0], _ext[1]) else: node_src = clip_node.get('src')