Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-3483: Live Stream: default fade in/out for live stream transition

Browse source 
- take care of bootstrap of pypo
This commit is contained in:
James 2012-03-20 22:29:52 -04:00
parent 6b768c2f99
commit b4e9f9699c
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/controllers/ApiController.php
View file

@ -1009,6 +1009,7 @@ class ApiController extends Zend_Controller_Action
$this->view->switch_status = $res; $this->view->switch_status = $res;
$this->view->station_name = Application_Model_Preference::GetStationName(); $this->view->station_name = Application_Model_Preference::GetStationName();
$this->view->stream_label = Application_Model_Preference::GetStreamLabelFormat(); $this->view->stream_label = Application_Model_Preference::GetStreamLabelFormat();
$this->view->transition_fade = Application_Model_Preference::GetDefaultTransitionFade();
} }
/* This is used but Liquidsoap to check authentication of live streams*/ /* This is used but Liquidsoap to check authentication of live streams*/

1
python_apps/pypo/pypofetch.py
View file

@ -155,6 +155,7 @@ class PypoFetch(Thread):
self.switch_source(k, v) self.switch_source(k, v)
self.update_liquidsoap_stream_format(info['stream_label']) self.update_liquidsoap_stream_format(info['stream_label'])
self.update_liquidsoap_station_name(info['station_name']) self.update_liquidsoap_station_name(info['station_name'])
self.update_liquidsoap_transition_fade(info['transition_fade'])
def regenerateLiquidsoapConf(self, setting_p): def regenerateLiquidsoapConf(self, setting_p):
existing = {} existing = {}