From 6dae7d3973b76e89d2ad5e22b4d001ee8189fb4c Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 15 Mar 2013 17:00:36 -0400 Subject: [PATCH] CC-1469: Crossfading support (non-equal power) -cleanup --- python_apps/pypo/pypopush.py | 4 ++++ python_apps/pypo/telnetliquidsoap.py | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/python_apps/pypo/pypopush.py b/python_apps/pypo/pypopush.py index 6ae3e27d1..8e85a8e01 100644 --- a/python_apps/pypo/pypopush.py +++ b/python_apps/pypo/pypopush.py @@ -168,6 +168,8 @@ class PypoPush(Thread): self.telnet_liquidsoap.queue_remove(i) self.liq_queue_tracker[i] = None + #liquidsoap.stop_play(mi) + if len(to_be_added): self.logger.info("Need to add items to Liquidsoap *now*: %s" % \ @@ -180,6 +182,8 @@ class PypoPush(Thread): self.telnet_liquidsoap.queue_push(queue_id, i) self.liq_queue_tracker[queue_id] = i + #liquidsoap.start_play(i) + def get_current_stream_id_from_liquidsoap(self): response = "-1" try: diff --git a/python_apps/pypo/telnetliquidsoap.py b/python_apps/pypo/telnetliquidsoap.py index 019a62b29..bfd49ec99 100644 --- a/python_apps/pypo/telnetliquidsoap.py +++ b/python_apps/pypo/telnetliquidsoap.py @@ -135,7 +135,6 @@ class TelnetLiquidsoap: self.logger.debug(msg) tn.write(msg) - #msg = 'dynamic_source.read_start %s\n' % media_item['uri'].encode('latin-1') msg = 'http.restart %s\n' % media_item['uri'].encode('latin-1') self.logger.debug(msg) tn.write(msg)