Merge branch 'master' of dev.sourcefabric.org:airtime

python_apps/pypo/pypocli.py

@@ -245,7 +245,7 @@ if __name__ == '__main__':
     pf.daemon = True
     pf.start()
 
-    pp = PypoPush(pypoPush_q, telnet_lock, pypo_liquidsoap)
+    pp = PypoPush(pypoPush_q, telnet_lock, pypo_liquidsoap, config)
     pp.daemon = True
     pp.start()
 

python_apps/pypo/pypofetch.py

@@ -281,7 +281,7 @@ class PypoFetch(Thread):
 
             line = line.strip()
 
-            if not len(line) or line[0] == "#"
+            if not len(line) or line[0] == "#":
                 continue
 
             try:

python_apps/pypo/pypopush.py

@@ -57,8 +57,7 @@ class PypoPush(Thread):
         self.queue_id = 0
 
         self.future_scheduled_queue = Queue()
-        self.pypo_liquidsoap = PypoLiquidsoap(self.logger, telnet_lock,\
-                config['ls_host'], config['ls_port'])
+        self.pypo_liquidsoap = pypo_liquidsoap
 
         self.plq = PypoLiqQueue(self.future_scheduled_queue, \
                 self.pypo_liquidsoap, \

python_apps/pypo/telnetliquidsoap.py

@@ -2,9 +2,9 @@ import telnetlib
 
 def create_liquidsoap_annotation(media):
     # We need liq_start_next value in the annotate. That is the value that controls overlap duration of crossfade.
-    return 'annotate:media_id="%s",liq_start_next="0",liq_fade_in="%s",' + \
+    return ('annotate:media_id="%s",liq_start_next="0",liq_fade_in="%s",' + \
             'liq_fade_out="%s",liq_cue_in="%s",liq_cue_out="%s",' + \
-            'schedule_table_id="%s",replay_gain="%s dB":%s' % \
+            'schedule_table_id="%s",replay_gain="%s dB":%s') % \
             (media['id'], 
                     float(media['fade_in']) / 1000, 
                     float(media['fade_out']) / 1000,