From 7a958ec8b681ccec3767e27c4eb2811efa6ae8bf Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 18 Sep 2012 15:52:16 -0400
Subject: [PATCH 1/3] formatting
---
airtime_mvc/application/models/User.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php
index 326e04940..63b82820a 100644
--- a/airtime_mvc/application/models/User.php
+++ b/airtime_mvc/application/models/User.php
@@ -1,9 +1,9 @@
<?php
-define('UTYPE_HOST', 'H');
-define('UTYPE_ADMIN', 'A');
-define('UTYPE_GUEST', 'G');
-define('UTYPE_PROGRAM_MANAGER', 'P');
+define('UTYPE_HOST' , 'H');
+define('UTYPE_ADMIN' , 'A');
+define('UTYPE_GUEST' , 'G');
+define('UTYPE_PROGRAM_MANAGER' , 'P');
class Application_Model_User
{
From 539cc9e11dfc21db90d2295a9f0ce287b332208f Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 18 Sep 2012 16:10:55 -0400
Subject: [PATCH 2/3] added comments
---
python_apps/media-monitor2/media/monitor/pure.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py
index 910ff2c2e..b6f3897ff 100644
--- a/python_apps/media-monitor2/media/monitor/pure.py
+++ b/python_apps/media-monitor2/media/monitor/pure.py
@@ -257,6 +257,8 @@ def normalized_metadata(md, original_path):
'MDATA_KEY_FILEPATH' : lambda x: os.path.normpath(x),
'MDATA_KEY_BPM' : lambda x: x[0:8],
'MDATA_KEY_MIME' : lambda x: x.replace('audio/vorbis','audio/ogg'),
+ # Whenever 0 is reported we change it to empty
+ #'MDATA_KEY_BITRATE' : lambda x: '' if str(x) == '0' else x
}
new_md = remove_whitespace(new_md) # remove whitespace fields
From d55915d6492d1d10d17341f1096120d054ad8fac Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 18 Sep 2012 16:40:23 -0400
Subject: [PATCH 3/3] naming convention fix
---
.../application/models/formatters/BitrateFormatter.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/airtime_mvc/application/models/formatters/BitrateFormatter.php b/airtime_mvc/application/models/formatters/BitrateFormatter.php
index 58bd56c64..f1455ca74 100644
--- a/airtime_mvc/application/models/formatters/BitrateFormatter.php
+++ b/airtime_mvc/application/models/formatters/BitrateFormatter.php
@@ -17,12 +17,12 @@ class BitrateFormatter
public function format()
{
- $Kbps = bcdiv($this->_bitrate, 1000, 0);
+ $kbps = bcdiv($this->_bitrate, 1000, 0);
- if ($Kbps == 0) {
+ if ($kbps == 0) {
return "";
} else {
- return "{$Kbps} Kbps";
+ return "$kbps Kbps";
}
}
}