Merge branch 'cc-1469-crossfade' into devel

Conflicts:
	python_apps/pypo/pypopush.py

python_apps/pypo/liquidsoap_scripts/ls_script.liq

@@ -35,7 +35,34 @@ just_switched = ref false
 
 %include "ls_lib.liq"
 
-queue = audio_to_stereo(id="queue_src", request.equeue(id="queue", length=0.5))
+sources = ref []
+source_id = ref 0
+
+def create_source()
+    l = request.equeue(id="s#{!source_id}", length=0.5)
+    sources := list.append([l], !sources)
+    server.register(namespace="queues",
+                "s#{!source_id}_skip",
+                fun (s) -> begin log("queues.s#{!source_id}_skip") 
+                    clear_queue(l) 
+                    "Done" 
+                end)
+    source_id := !source_id + 1
+end
+
+create_source()
+create_source()
+create_source()
+create_source()
+
+create_source()
+create_source()
+create_source()
+create_source()
+
+queue = add(!sources)
+
+queue = audio_to_stereo(id="queue_src", queue)
 queue = cue_cut(queue)
 queue = amplify(1., override="replay_gain", queue)
 
@@ -248,7 +275,7 @@ end
 
 
 # Attach a skip command to the source s:
-add_skip_command(s)
+#add_skip_command(s)
 
 server.register(namespace="streams",
     description="Stop Master DJ source.",