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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2012-03-26 19:02:05 -04:00
parent 3f713ca8dc f41ebbe7a7
commit 712371bde4
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/public/css/styles.css
View File

@ -291,7 +291,7 @@ select {
.source-info-block { .source-info-block {
padding:0 14px 0 2px; padding:0 14px 0 2px;
min-width:180px; min-width:200px;
} }
.source-info-block li { .source-info-block li {

1
python_apps/api_clients/api_client.py
View File

@ -660,6 +660,7 @@ class AirTimeApiClient(ApiClientInterface):
response = json.loads(response) response = json.loads(response)
logger.info("Bootstrap info retrieved %s", response) logger.info("Bootstrap info retrieved %s", response)
except Exception, e: except Exception, e:
response = None
import traceback import traceback
top = traceback.format_exc() top = traceback.format_exc()
logger.error('Exception: %s', e) logger.error('Exception: %s', e)

2
python_apps/pypo/liquidsoap_scripts/ls_lib.liq
View File

@ -18,7 +18,7 @@ end
def transition(a,b) = def transition(a,b) =
log("transition called...") log("transition called...")
add(normalize=false, add(normalize=false,
[ sequence([ blank(duration=2.), [ sequence([ blank(duration=0.1),
fade.initial(duration=!default_dj_fade, b) ]), fade.initial(duration=!default_dj_fade, b) ]),
fade.final(duration=!default_dj_fade, a) ]) fade.final(duration=!default_dj_fade, a) ])
end end

16
python_apps/pypo/pypofetch.py
View File

@ -150,12 +150,16 @@ class PypoFetch(Thread):
def set_bootstrap_variables(self): def set_bootstrap_variables(self):
self.logger.debug('Getting information needed on bootstrap from Airtime') self.logger.debug('Getting information needed on bootstrap from Airtime')
info = self.api_client.get_bootstrap_info() info = self.api_client.get_bootstrap_info()
self.logger.debug('info:%s',info) if info == None:
for k, v in info['switch_status'].iteritems(): self.logger.error('Unable to get bootstrap info.. Existing pypo...')
self.switch_source(k, v) sys.exit(0)
self.update_liquidsoap_stream_format(info['stream_label']) else:
self.update_liquidsoap_station_name(info['station_name']) self.logger.debug('info:%s',info)
self.update_liquidsoap_transition_fade(info['transition_fade']) for k, v in info['switch_status'].iteritems():
self.switch_source(k, v)
self.update_liquidsoap_stream_format(info['stream_label'])
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 = {}