From ca2a535b24a5641538c277c4427364b83b9d1517 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@martin-ThinkPad-T410.(none)>
Date: Fri, 14 Oct 2011 14:25:28 +0200
Subject: [PATCH 1/3] CC-2908: Add "Live Stream" title to live stream popup
 window

-fixed logo size being too big.
---
 .../application/views/scripts/dashboard/stream-player.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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(){
         ?>
 });
 </script>
-  <div class="jp-logo"><img id="logo-img" onload='resizeToMaxHeight(this, 67);' src="<?php echo $this->logo ?>" /></div>
+  <div class="jp-logo"><img id="logo-img" onload='resizeToMaxHeight(this, 40);' src="<?php echo $this->logo ?>" /></div>
         <div class="jp-stream">
             <div class="jp-stream-text">Select stream:</div>
                 

From e3093b98a53cd9caf3d04ea3d1decaf4a062972f Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@martin-ThinkPad-T410.(none)>
Date: Fri, 14 Oct 2011 14:26:10 +0200
Subject: [PATCH 2/3] CC-2870: Create testing infrastructure for testing
 upgrades

-shuffle and rename some functions
---
 dev_tools/fabric/fab_setup.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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')

From 7548abc1b1a79dcedc641664cb95bf4cb93d9c6f Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@martin-ThinkPad-T410.(none)>
Date: Mon, 17 Oct 2011 13:36:16 +0200
Subject: [PATCH 3/3] -fix undefined function error

---
 airtime_mvc/application/models/StoredFile.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 238fdd69e..caa6abc52 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -443,7 +443,7 @@ class StoredFile {
         $serverName = $_SERVER['SERVER_NAME'];
         $serverPort = $_SERVER['SERVER_PORT'];
         
-        return constructGetFileUrl($serverName, $serverPort);
+        return $this->constructGetFileUrl($serverName, $serverPort);
     }
     
     /**
@@ -456,7 +456,7 @@ class 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){