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-13 11:12:51 -04:00
parent a779142a08 65e94cfdf0
commit 771ca5e0b3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/public/js/airtime/library/library.js
View File

@ -353,7 +353,7 @@ var AIRTIME = (function(AIRTIME) {
var label = ""; var label = "";
if (ele.mDataProp == "bit_rate") { if (ele.mDataProp == "bit_rate") {
label = " (bps)"; label = " (bps)";
} else if (ele.mDataProp == "utime" || ele.mDataPro == "mtime" || ele.mDataPro == "lptime") { } else if (ele.mDataProp == "utime" || ele.mDataProp == "mtime" || ele.mDataProp == "lptime") {
label = " (yyyy-mm-dd)"; label = " (yyyy-mm-dd)";
} else if (ele.mDataProp == "length") { } else if (ele.mDataProp == "length") {
label = " (hh:mm:ss.t)"; label = " (hh:mm:ss.t)";

2
python_apps/media-monitor2/media/update/replaygain.py
View File

@ -58,7 +58,7 @@ def get_file_type(file_path):
elif re.search(r'flac$', file_path, re.IGNORECASE): elif re.search(r'flac$', file_path, re.IGNORECASE):
file_type = 'flac' file_type = 'flac'
else: else:
mime_type = get_mime_type(file_path) == "audio/mpeg" mime_type = get_mime_type(file_path)
if 'mpeg' in mime_type: if 'mpeg' in mime_type:
file_type = 'mp3' file_type = 'mp3'
elif 'ogg' in mime_type: elif 'ogg' in mime_type: