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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
denise 2012-09-18 16:49:52 -04:00
parent 54ab58a9c7 d55915d649
commit cc966ca62b
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
airtime_mvc/application/models/User.php
View File

@ -1,9 +1,9 @@
<?php <?php
define('UTYPE_HOST', 'H'); define('UTYPE_HOST' , 'H');
define('UTYPE_ADMIN', 'A'); define('UTYPE_ADMIN' , 'A');
define('UTYPE_GUEST', 'G'); define('UTYPE_GUEST' , 'G');
define('UTYPE_PROGRAM_MANAGER', 'P'); define('UTYPE_PROGRAM_MANAGER' , 'P');
class Application_Model_User class Application_Model_User
{ {

6
airtime_mvc/application/models/formatters/BitrateFormatter.php
View File

@ -17,12 +17,12 @@ class BitrateFormatter
public function format() public function format()
{ {
$Kbps = bcdiv($this->_bitrate, 1000, 0); $kbps = bcdiv($this->_bitrate, 1000, 0);
if ($Kbps == 0) { if ($kbps == 0) {
return ""; return "";
} else { } else {
return "{$Kbps} Kbps"; return "$kbps Kbps";
} }
} }
} }

2
python_apps/media-monitor2/media/monitor/pure.py
View File

@ -257,6 +257,8 @@ def normalized_metadata(md, original_path):
'MDATA_KEY_FILEPATH' : lambda x: os.path.normpath(x), 'MDATA_KEY_FILEPATH' : lambda x: os.path.normpath(x),
'MDATA_KEY_BPM' : lambda x: x[0:8], 'MDATA_KEY_BPM' : lambda x: x[0:8],
'MDATA_KEY_MIME' : lambda x: x.replace('audio/vorbis','audio/ogg'), '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 new_md = remove_whitespace(new_md) # remove whitespace fields