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

-fix restarting airtime playout not resyncing to schedule correctly
This commit is contained in:
Martin Konecny 2013-04-22 17:33:56 -04:00
parent 96579b7ef4
commit 07f0ae6c28
5 changed files with 46 additions and 15 deletions

View file

@ -51,7 +51,7 @@ def is_file(media_item):
return media_item['type'] == 'file'
class PypoPush(Thread):
def __init__(self, q, telnet_lock):
def __init__(self, q, telnet_lock, pypo_liquidsoap):
Thread.__init__(self)
self.api_client = api_client.AirtimeApiClient()
self.queue = q
@ -64,8 +64,10 @@ class PypoPush(Thread):
self.queue_id = 0
self.future_scheduled_queue = Queue()
self.pypo_liquidsoap = PypoLiquidsoap(self.logger, telnet_lock,\
LS_HOST, LS_PORT)
#self.pypo_liquidsoap = PypoLiquidsoap(self.logger, telnet_lock,\
#LS_HOST, LS_PORT)
self.pypo_liquidsoap = pypo_liquidsoap
self.plq = PypoLiqQueue(self.future_scheduled_queue, \
self.pypo_liquidsoap, \