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

reordering

Browse Source
This commit is contained in:
jb-alvarado 2019-10-30 21:34:16 +01:00
parent 045870f95c
commit f079773967
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ffplayout.py
View File

@ -121,6 +121,20 @@ def load_config():
else: else:
cfg.read('ffplayout.conf') cfg.read('ffplayout.conf')
if stdin_args.start:
if stdin_args.start == 'now':
start_t = None
elif validate_time:
stime = stdin_args.start.split(':')
start_t = str_to_sec(stime)
else:
stime = cfg.get('PLAYLIST', 'day_start').split(':')
if stime[0] and stime[1] and stime[2]:
start_t = str_to_sec(stime)
else:
start_t = None
_general.stop = cfg.getboolean('GENERAL', 'stop_on_error') _general.stop = cfg.getboolean('GENERAL', 'stop_on_error')
_general.threshold = cfg.getfloat('GENERAL', 'stop_threshold') _general.threshold = cfg.getfloat('GENERAL', 'stop_threshold')
@ -142,20 +156,6 @@ def load_config():
_pre_comp.loud_lra = cfg.getfloat('PRE_COMPRESS', 'loud_LRA') _pre_comp.loud_lra = cfg.getfloat('PRE_COMPRESS', 'loud_LRA')
_pre_comp.protocols = cfg.get('PRE_COMPRESS', 'live_protocols') _pre_comp.protocols = cfg.get('PRE_COMPRESS', 'live_protocols')
if stdin_args.start:
if stdin_args.start == 'now':
start_t = None
elif validate_time:
stime = stdin_args.start.split(':')
start_t = str_to_sec(stime)
else:
stime = cfg.get('PLAYLIST', 'day_start').split(':')
if stime[0] and stime[1] and stime[2]:
start_t = str_to_sec(stime)
else:
start_t = None
_playlist.mode = cfg.getboolean('PLAYLIST', 'playlist_mode') _playlist.mode = cfg.getboolean('PLAYLIST', 'playlist_mode')
_playlist.path = cfg.get('PLAYLIST', 'path') _playlist.path = cfg.get('PLAYLIST', 'path')
_playlist.start = start_t _playlist.start = start_t