From 2e811dfef8c8948426f6c67ba4327eef0c483ffb Mon Sep 17 00:00:00 2001 From: James Date: Mon, 16 Apr 2012 15:23:37 -0400 Subject: [PATCH] CC-3642: System->Streams->DJ URL changes are not reflected in Calendar ->LiveStream - fixed --- .../application/controllers/PreferenceController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index ef5c3b475..8a5f9e9db 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -213,6 +213,12 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetLiveSteamMasterPassword($values["master_password"]); Application_Model_Preference::SetDefaultTransitionFade($values["transition_fade"]); + $master_connection_url = "http://".$_SERVER['SERVER_NAME'].":".$values["master_harbor_input_port"]."/".$values["master_harbor_input_mount_point"]; + $live_connection_url = "http://".$_SERVER['SERVER_NAME'].":".$values["dj_harbor_input_port"]."/".$values["dj_harbor_input_mount_point"]; + + Application_Model_Preference::SetMasterDJSourceConnectionURL($master_connection_url); + Application_Model_Preference::SetLiveDJSourceConnectionURL($live_connection_url); + // extra info that goes into cc_stream_setting Application_Model_StreamSetting::SetMasterLiveSteamPort($values["master_harbor_input_port"]); Application_Model_StreamSetting::SetMasterLiveSteamMountPoint($values["master_harbor_input_mount_point"]);