djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Jonathan Baecker 2019-06-19 17:05:48 +02:00
commit 499f7b44dd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ffplayout.py
View File

@ -94,7 +94,7 @@ _playlist = SimpleNamespace(
start=0,
filler=cfg.get('PLAYLIST', 'filler_clip'),
blackclip=cfg.get('PLAYLIST', 'blackclip'),
shift=cfg.getint('PLAYLIST', 'time_shift'),
shift=cfg.getfloat('PLAYLIST', 'time_shift'),
map_ext=json.loads(cfg.get('PLAYLIST', 'map_extension'))
)
@ -266,9 +266,8 @@ def get_time(time_format):
if time_format == 'hour':
return t.hour
elif time_format == 'full_sec':
sec = float(t.hour * 3600 + t.minute * 60 + t.second)
micro = float(t.microsecond) / 1000000
return sec + micro
return t.hour * 3600 + t.minute * 60 + t.second \
+ t.microsecond / 1000000
elif time_format == 'stamp':
return float(datetime.now().timestamp())
else: