Merge branch '1.9.1' into devel
Conflicts: VERSION airtime_mvc/application/configs/constants.php install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py python_apps/pypo/pypofetch.py
This commit is contained in:
commit
56ad8c6b3d
17 changed files with 545 additions and 13 deletions
|
@ -6,9 +6,8 @@ set("log.stdout", true)
|
|||
set("server.telnet", true)
|
||||
set("server.telnet.port", 1234)
|
||||
|
||||
queue = request.queue(id="queue", length=0.5)
|
||||
queue = audio_to_stereo(request.queue(id="queue", length=0.5))
|
||||
queue = cue_cut(queue)
|
||||
queue = audio_to_stereo(queue)
|
||||
|
||||
pypo_data = ref '0'
|
||||
web_stream_enabled = ref false
|
||||
|
@ -51,7 +50,6 @@ s = crossfade(s)
|
|||
add_skip_command(s)
|
||||
s = map_metadata(append_title, s)
|
||||
|
||||
|
||||
if output_sound_device then
|
||||
ignore(output.alsa(s))
|
||||
end
|
||||
|
|
|
@ -477,7 +477,8 @@ class PypoFetch(Thread):
|
|||
# most recent schedule. After that we can just wait for updates.
|
||||
status, self.schedule_data = self.api_client.get_schedule()
|
||||
if status == 1:
|
||||
self.process_schedule(self.schedule_data , "scheduler", True)
|
||||
logger.info("Bootstrap schedule received: %s", schedule_data)
|
||||
self.process_schedule(schedule_data, "scheduler", True)
|
||||
logger.info("Bootstrap complete: got initial copy of the schedule")
|
||||
|
||||
loops = 1
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue