Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x

Browse source
This commit is contained in:
Martin Konecny 2012-06-05 22:30:50 -04:00
commit 68deba81d9
9 changed files with 101 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/models/Preference.php
View file

@ -840,6 +840,14 @@ class Application_Model_Preference
return self::GetValue("live_dj_source_connection_url");
}
public static function SetAutoTransition($value){
self::SetValue("auto_transition", $value, false);
}
public static function GetAutoTransition(){
return self::GetValue("auto_transition");
}
public static function SetEnableSystemEmail($upload) {
self::SetValue("enable_system_email", $upload);
}

22
airtime_mvc/application/models/StreamSetting.php
View file

@ -281,6 +281,28 @@ class Application_Model_StreamSetting {
}
return $out;
}
public static function GetConnectionUrls($p_source_type) {
if (strcmp($p_source_type, "master")==0) {
$m_port = Application_Model_StreamSetting::GetMasterLiveSteamPort();
$m_mount = Application_Model_StreamSetting::GetMasterLiveSteamMountPoint();
$master_dj_connection_url = Application_Model_Preference::GetMasterDJSourceConnectionURL();
$connection_url = ($master_dj_connection_url == "")?("http://".$_SERVER['SERVER_NAME'].":".$m_port."/".$m_mount):$master_dj_connection_url;
if($m_port=="" || $m_mount==""){
$connection_url = "N/A";
}
}
else if (strcmp($p_source_type, "show")==0) {
$l_port = Application_Model_StreamSetting::GetDJLiveSteamPort();
$l_mount = Application_Model_StreamSetting::GetDJLiveSteamMountPoint();
$live_dj_connection_url = Application_Model_Preference::GetLiveDJSourceConnectionURL();
$connection_url = ($live_dj_connection_url == "")?"http://".$_SERVER['SERVER_NAME'].":".$l_port."/".$l_mount:$live_dj_connection_url;
if($l_port=="" || $l_mount==""){
$connection_url = "N/A";
}
}
return $connection_url;
}
public static function SetMasterLiveSteamPort($value){
self::SetValue("master_live_stream_port", $value, "integer");