diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 7a4059e96..69e7359d5 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -443,7 +443,7 @@ class Application_Model_StoredFile { $serverName = $_SERVER['SERVER_NAME']; $serverPort = $_SERVER['SERVER_PORT']; - return constructGetFileUrl($serverName, $serverPort); + return $this->constructGetFileUrl($serverName, $serverPort); } /** @@ -456,7 +456,7 @@ class Application_Model_StoredFile { $serverName = $CC_CONFIG['baseUrl']; $serverPort = $CC_CONFIG['basePort']; - return constructGetFileUrl($serverName, $serverPort); + return $this->constructGetFileUrl($serverName, $serverPort); } private function constructGetFileUrl($p_serverName, $p_serverPort){ diff --git a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml index 21e9d9a30..7b9d6a796 100644 --- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml @@ -42,7 +42,7 @@ $(document).ready(function(){ ?> }); - +
Select stream:
diff --git a/dev_tools/fabric/fab_setup.py b/dev_tools/fabric/fab_setup.py index 8dbe87bda..45b428f5a 100644 --- a/dev_tools/fabric/fab_setup.py +++ b/dev_tools/fabric/fab_setup.py @@ -126,7 +126,12 @@ def airtime_182_tar(): reboot(45) sudo('airtime-check-system') -def airtime_182_deb(): +def airtime_194_tar(): + run('wget http://downloads.sourceforge.net/project/airtime/1.9.4/airtime-1.9.4.tar.gz') + run('tar xfz airtime-1.9.4.tar.gz') + sudo('cd ~/airtime-1.9.4/install_full/ubuntu && ./airtime-full-install') + +def airtime_latest_deb(): append('/etc/apt/sources.list', "deb http://apt.sourcefabric.org/ lucid main", use_sudo=True) append('/etc/apt/sources.list', "deb http://archive.ubuntu.com/ubuntu/ lucid multiverse", use_sudo=True) sudo('apt-get update') @@ -135,11 +140,6 @@ def airtime_182_deb(): sudo('apt-get install -y icecast2') sudo('apt-get purge -y pulseaudio') sudo('apt-get install -y --force-yes airtime') - -def airtime_194_tar(): - run('wget http://downloads.sourceforge.net/project/airtime/1.9.4/airtime-1.9.4.tar.gz') - run('tar xfz airtime-1.9.4.tar.gz') - sudo('cd ~/airtime-1.9.4/install_full/ubuntu && ./airtime-full-install') def airtime_devel(): sudo('apt-get update')