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

CC-1469: Crossfading support (non-equal power)

Browse source 
-fix few bugs
This commit is contained in:
Martin Konecny 2013-03-22 15:21:28 -04:00
parent 33ca2e7c9c
commit 8a5c82d71a
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
python_apps/pypo/pypoliquidsoap.py
View file

@ -23,7 +23,7 @@ class PypoLiquidsoap():
port) port)
def push_item(self, media_item): def play(self, media_item):
if media_item["type"] == eventtypes.FILE: if media_item["type"] == eventtypes.FILE:
self.handle_file_type(media_item) self.handle_file_type(media_item)
elif media_item["type"] == eventtypes.EVENT: elif media_item["type"] == eventtypes.EVENT:
@ -128,7 +128,7 @@ class PypoLiquidsoap():
filter(lambda x: x["type"] == eventtypes.STREAM_OUTPUT_START, \ filter(lambda x: x["type"] == eventtypes.STREAM_OUTPUT_START, \
scheduled_now) scheduled_now)
schedule_ids = set(map(lambda x: i["row_id"], scheduled_now_files)) schedule_ids = set(map(lambda x: x["row_id"], scheduled_now_files))
liq_queue_ids = set() liq_queue_ids = set()
@ -150,10 +150,7 @@ class PypoLiquidsoap():
if mi is not None and mi["row_id"] in to_be_removed: if mi is not None and mi["row_id"] in to_be_removed:
self.stop(i) self.stop(i)
#stop any webstreams
if self.telnet_liquidsoap.get_current_stream_id() in to_be_removed:
self.telnet_liquidsoap.stop_web_stream_buffer()
self.telnet_liquidsoap.stop_web_stream_output()
if len(to_be_added): if len(to_be_added):
self.logger.info("Need to add items to Liquidsoap *now*: %s" % \ self.logger.info("Need to add items to Liquidsoap *now*: %s" % \
@ -165,12 +162,13 @@ class PypoLiquidsoap():
self.play(i) self.play(i)
current_stream_id = self.telnet_liquidsoap.get_current_stream_id() current_stream_id = self.telnet_liquidsoap.get_current_stream_id()
#if len(scheduled_now_webstream): if len(scheduled_now_webstream):
#if current_stream_id != scheduled_now_webstream[0]: if current_stream_id != scheduled_now_webstream[0]:
#self.play(scheduled_now_webstream[0]) self.play(scheduled_now_webstream[0])
elif current_stream_id != "-1":
def play(self, media_item): #something is playing and it shouldn't be.
self.telnet_liquidsoap.push_item(media_item) self.telnet_liquidsoap.stop_web_stream_buffer()
self.telnet_liquidsoap.stop_web_stream_output()
def stop(self, queue): def stop(self, queue):
self.telnet_liquidsoap.queue_remove(queue) self.telnet_liquidsoap.queue_remove(queue)

4
python_apps/pypo/telnetliquidsoap.py
View file

@ -147,8 +147,8 @@ class TelnetLiquidsoap:
finally: finally:
self.telnet_lock.release() self.telnet_lock.release()
def get_current_stream_id(): def get_current_stream_id(self):
try: try:
self.telnet_lock.acquire() self.telnet_lock.acquire()
tn = telnetlib.Telnet(self.ls_host, self.ls_port) tn = telnetlib.Telnet(self.ls_host, self.ls_port)