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

Merge pull request #84 from Robbt/fix/live-stream-source

Browse source 
[WIP] Making show and master source ports and mount points editable.
This commit is contained in:
Lucas Bickel 2017-03-20 02:06:58 +01:00 • committed by GitHub
commit 81d3c3e2b8
9 changed files with 206 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1113,7 +1113,13 @@ class Application_Model_Preference
public static function GetMasterDJSourceConnectionURL()
{
return self::getValue("master_dj_source_connection_url");
$master_connection_url = self::getValue("master_dj_source_connection_url");
if ($master_connection_url == "") {
$master_connection_url = "http://".$_SERVER['SERVER_NAME'].":". Application_Model_StreamSetting::getMasterLiveStreamPort() . Application_Model_StreamSetting::getMasterLiveStreamMountPoint();
}
return $master_connection_url;
}
public static function SetLiveDJSourceConnectionURL($value)
@ -1123,7 +1129,11 @@ class Application_Model_Preference
public static function GetLiveDJSourceConnectionURL()
{
return self::getValue("live_dj_source_connection_url");
$livedj_connection_url = self::getValue("live_dj_source_connection_url");
if ($livedj_connection_url == "") {
$livedj_connection_url = "http://".$_SERVER['SERVER_NAME'].":". Application_Model_StreamSetting::getDjLiveStreamPort() . Application_Model_StreamSetting::getDjLiveStreamMountPoint();
}
return $livedj_connection_url;
}
/* Source Connection URL override status starts */