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

Merge branch '2.4.x'

Browse source 
Conflicts:
	airtime_mvc/public/js/airtime/preferences/streamsetting.js
	python_apps/pypo/pypocli.py
	python_apps/pypo/schedule/telnetliquidsoap.py
This commit is contained in:
Martin Konecny 2013-05-22 12:07:08 -04:00
commit b0eda6e915
60 changed files with 38938 additions and 38579 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python_apps/pypo/schedule/telnetliquidsoap.py
View file

@ -73,12 +73,10 @@ class TelnetLiquidsoap:
def queue_push(self, queue_id, media_item):
with self.telnet_lock:
if not self.__is_empty(queue_id):
raise QueueNotEmptyException()
tn = self.__connect()
annotation = create_liquidsoap_annotation(media_item)
msg = '%s.push %s\n' % (queue_id, annotation.encode('utf-8'))
self.logger.debug(msg)