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

Removed crazy handling of flac.

Browse source
This commit is contained in:
Rudi Grinberg 2012-09-07 18:23:14 -04:00
parent 78b0dcedfc
commit a479a11c8f
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/models/StoredFile.php
View file

@ -413,8 +413,10 @@ class Application_Model_StoredFile
return "ogg"; return "ogg";
} elseif ($mime == "audio/mp3" || $mime == "audio/mpeg") { } elseif ($mime == "audio/mp3" || $mime == "audio/mpeg") {
return "mp3"; return "mp3";
} elseif ($mime == "audio/x/flac") { } elseif ($mime == "audio/x-flac") {
return "flac"; return "flac";
} else {
throw new Exception("Unknown $mime");
} }
} }

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

@ -244,7 +244,7 @@ def normalized_metadata(md, original_path):
format_rules = { format_rules = {
'MDATA_KEY_TRACKNUMBER' : parse_int, 'MDATA_KEY_TRACKNUMBER' : parse_int,
'MDATA_KEY_FILEPATH' : lambda x: os.path.normpath(x), 'MDATA_KEY_FILEPATH' : lambda x: os.path.normpath(x),
'MDATA_KEY_MIME' : lambda x: x.replace('-','/'), #'MDATA_KEY_MIME' : lambda x: x.replace('-','/'),
'MDATA_KEY_BPM' : lambda x: x[0:8], 'MDATA_KEY_BPM' : lambda x: x[0:8],
} }