From 7e19eba7e1806a49a9815c99050e0d497cb61bd6 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Fri, 1 Mar 2013 11:44:11 -0500
Subject: [PATCH] another refactor of LS source

---
 .../pypo/liquidsoap_scripts/ls_script.liq     | 64 +++++++------------
 1 file changed, 24 insertions(+), 40 deletions(-)

diff --git a/python_apps/pypo/liquidsoap_scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
index 5f7e16e28..64066e660 100644
--- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq
+++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
@@ -199,8 +199,7 @@ def append_dj_inputs(master_harbor_input_port,
          master_harbor_input_mount_point, 
         dj_harbor_input_port,
         dj_harbor_input_mount_point, 
-        s,
-        default) =
+        s) =
     if master_harbor_input_port != 0 
             and master_harbor_input_mount_point != "" 
             and dj_harbor_input_port != 0 
@@ -229,17 +228,12 @@ def append_dj_inputs(master_harbor_input_port,
         ignore(output.dummy(master_dj, fallible=true))
         ignore(output.dummy(dj_live, fallible=true))
 
-        switch(id="master_dj_switch", 
-            track_sensitive=false, 
-            transitions=[transition, transition, transition, transition], 
+        ([transition, transition, transition],
             [
                 ({!master_dj_enabled},master_dj), 
                 ({!live_dj_enabled},dj_live), 
-                ({!scheduled_play_enabled}, s),
-                ({true}, default),
-            ],
-
-        )
+                ({true}, s),
+            ])
 
     elsif master_harbor_input_port != 0 and master_harbor_input_mount_point != "" then
         master_dj = mksafe(
@@ -254,15 +248,11 @@ def append_dj_inputs(master_harbor_input_port,
 
         ignore(output.dummy(master_dj, fallible=true))
         
-        switch(id="master_dj_switch", 
-            track_sensitive=false, 
-            transitions=[transition, transition, transition], 
+        ([transition, transition], 
             [
                 ({!master_dj_enabled},master_dj),
-                ({!scheduled_play_enabled}, s), 
-                ({true}, default),
-            ]
-        )
+                ({true}, s), 
+            ])
 
     elsif dj_harbor_input_port != 0 and dj_harbor_input_mount_point != "" then
         dj_live = mksafe(
@@ -277,39 +267,33 @@ def append_dj_inputs(master_harbor_input_port,
 
         ignore(output.dummy(dj_live, fallible=true))
 
-        switch(id="live_dj_switch", 
-            track_sensitive=false, 
-            transitions=[transition, transition, transition], 
+        ([transition, transition],
             [
                 ({!live_dj_enabled},dj_live), 
-                ({!scheduled_play_enabled}, s),
-                ({true}, default),
-            ]
-        )
+                ({true}, s),
+            ])
     else
-        switch(id="no_dj_inputs", 
-            track_sensitive=false, 
-            transitions=[transition, transition], 
-            [
-                ({!scheduled_play_enabled}, s),
-                ({true}, default),
-            ]
-        )
+        ([transition], [
+                ({true}, s),
+            ])
     end
 end
 
+s = switch(id="default_switch", 
+    track_sensitive=false,
+    transitions=[transition_default, transition],
+    [({!scheduled_play_enabled}, stream_queue), ({true}, default)])
 
+pair = append_dj_inputs(master_live_stream_port, master_live_stream_mp,
+    dj_live_stream_port, dj_live_stream_mp, s)
 
-s = append_dj_inputs(master_live_stream_port, master_live_stream_mp,
-    dj_live_stream_port, dj_live_stream_mp, stream_queue, default)
-
-#s = fallback(id="default_fallback", 
-#    track_sensitive=false,
-#    transitions=[transition_default, transition],
-#    [s, default])
+s = switch(id="master_switch", 
+    track_sensitive=false, 
+    transitions=fst(pair), 
+    snd(pair)
+)
 
 # Attach a skip command to the source s:
-
 add_skip_command(s)
 
 server.register(namespace="streams",