From dfe87723f07c1b7c452e43f4e5e0c9e7ba42cf9e Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 5 Mar 2012 13:51:59 -0500
Subject: [PATCH] - bug fix in stream setting - testing lisquidsoap

---
 .../application/models/StreamSetting.php      | 34 ++++++++++++++-----
 .../pypo/liquidsoap_scripts/ls_script.liq     | 20 ++++++-----
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php
index e2a8d0989..283085f41 100644
--- a/airtime_mvc/application/models/StreamSetting.php
+++ b/airtime_mvc/application/models/StreamSetting.php
@@ -106,18 +106,36 @@ class Application_Model_StreamSetting {
                 ." WHERE keyname not like '%_error'";
 
         $rows = $CC_DBC->getAll($sql);
-        if(isset($rows["master_harbor_input_port"])){
-            $rows[] = (array("keyname" =>"master_harbor_input_port", "value"=>self::GetMasterLiveSteamPort(), "type"=>"integer"));
+        
+        $exists = array();
+        
+        foreach($rows as $r){
+            if($r['keyname'] == 'master_live_stream_port'){
+                $exists['master_live_stream_port'] = true;
+            }elseif($r['keyname'] == 'master_live_stream_mp'){
+                $exists['master_live_stream_mp'] = true;
+            }elseif($r['keyname'] == 'dj_live_stream_port'){
+                $exists['dj_live_stream_port'] = true;
+            }elseif($r['keyname'] == 'dj_live_stream_mp'){
+                $exists['dj_live_stream_mp'] = true;
+            }
         }
-        if(isset($rows["master_harbor_input_mount_point"])){
-            $rows[] = (array("keyname" =>"master_harbor_input_mount_point", "value"=>self::GetMasterLiveSteamMountPoint(), "type"=>"string"));
+        
+        Logging::log(print_r($exits, true));
+        
+        if(!isset($exists["master_live_stream_port"])){
+            $rows[] = (array("keyname" =>"master_live_stream_port", "value"=>self::GetMasterLiveSteamPort(), "type"=>"integer"));
         }
-        if(isset($rows["dj_harbor_input_port"])){
-            $rows[] = (array("keyname" =>"dj_harbor_input_port", "value"=>self::GetDJLiveSteamPort(), "type"=>"integer"));
+        if(!isset($exists["master_live_stream_mp"])){
+            $rows[] = (array("keyname" =>"master_live_stream_mp", "value"=>self::GetMasterLiveSteamMountPoint(), "type"=>"string"));
         }
-        if(isset($rows["dj_harbor_input_mount_point"])){
-            $rows[] = (array("keyname" =>"dj_harbor_input_mount_point", "value"=>self::GetDJLiveSteamMountPoint(), "type"=>"string"));
+        if(!isset($exists["dj_live_stream_port"])){
+            $rows[] = (array("keyname" =>"dj_live_stream_port", "value"=>self::GetDJLiveSteamPort(), "type"=>"integer"));
         }
+        if(!isset($exists["dj_live_stream_mp"])){
+            $rows[] = (array("keyname" =>"dj_live_stream_mp", "value"=>self::GetDJLiveSteamMountPoint(), "type"=>"string"));
+        }
+        Logging::log(print_r($rows, true));
         return $rows;
     }
     
diff --git a/python_apps/pypo/liquidsoap_scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
index cc3b485ba..bce4076ff 100644
--- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq
+++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
@@ -68,13 +68,15 @@ def check_dj_client(user,password) =
         end
 end
 
-master_dj = ref default
-dj_live = ref default
+#master_dj = ref default
+#dj_live = ref default
 
 def append_master_dj_input(master_harbor_input_port, master_harbor_input_mount_point, s) =
     if master_harbor_input_port != 0 and master_harbor_input_mount_point != "" then
-        master_dj := input.harbor(master_harbor_input_mount_point, port=master_harbor_input_port, auth=check_master_dj_client, buffer=7.,max=15.)
-        fallback(track_sensitive=false, [!master_dj, s])
+        master_dj = input.harbor(master_harbor_input_mount_point, port=master_harbor_input_port, auth=check_master_dj_client, buffer=0.5,max=15.)
+        
+        ignore(output.dummy(master_dj, fallible=true))
+        fallback(track_sensitive=false, [master_dj, s])
     else
         s
     end
@@ -82,8 +84,10 @@ end
 
 def append_dj_input(dj_harbor_input_port, dj_harbor_input_mount_point, s) =
     if dj_harbor_input_port != 0 and dj_harbor_input_mount_point != "" then
-        dj_live := input.harbor(dj_harbor_input_mount_point, port=dj_harbor_input_port, auth=check_dj_client, buffer=7.,max=15.)
-        fallback(track_sensitive=false, [!dj_live, s])
+        dj_live = input.harbor(dj_harbor_input_mount_point, port=dj_harbor_input_port, auth=check_dj_client, buffer=0.5,max=15.)
+        
+        ignore(output.dummy(dj_live, fallible=true))
+        fallback(track_sensitive=false, [dj_live, s])
     else
         s
     end
@@ -193,6 +197,6 @@ if s3_enable == true then
     output_to(s3_output, s3_type, s3_bitrate, s3_host, s3_port, s3_pass, s3_mount, s3_url, s3_description, s3_genre, s3_user, s, "3", s3_connected)
 end
 
-output.dummy(fallible=true, !master_dj)
-output.dummy(fallible=true, !dj_live)
+#output.dummy(fallible=true, !master_dj)
+#output.dummy(fallible=true, !dj_live)
 ignore(output.dummy(blank()))