summaryrefslogtreecommitdiffstats
path: root/modules/id3/vainfo.class.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-10-19 04:26:11 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-10-19 04:26:11 +0000
commitd45a743f64419e590a59cb1589abde773505c7d7 (patch)
treedfd10d245bcf7afc6a180a6203c9cf1ca44e3675 /modules/id3/vainfo.class.php
parent1c1ad6ef87a034ee6491844b1650cd6aa0cb3093 (diff)
downloadampache-d45a743f64419e590a59cb1589abde773505c7d7.tar.gz
ampache-d45a743f64419e590a59cb1589abde773505c7d7.tar.bz2
ampache-d45a743f64419e590a59cb1589abde773505c7d7.zip
improved quarantine a little more and updated to new getid3 some genre issues still unresolved
Diffstat (limited to 'modules/id3/vainfo.class.php')
-rwxr-xr-xmodules/id3/vainfo.class.php23
1 files changed, 19 insertions, 4 deletions
diff --git a/modules/id3/vainfo.class.php b/modules/id3/vainfo.class.php
index 14d2f658..18a3ed4f 100755
--- a/modules/id3/vainfo.class.php
+++ b/modules/id3/vainfo.class.php
@@ -348,11 +348,26 @@ class vainfo {
/* Go through the tags */
foreach ($tags as $tag=>$data) {
-
- /* This is our baseline for naming so
- * no translation is needed
+
+ /**
+ * the new getid3 handles this differently
+ * so we now need to account for it :(
*/
- $array[$tag] = $this->_clean_tag($data['0'],$this->_file_encoding);
+ switch ($tag) {
+ case 'track_number':
+ $array['track'] = $this->_clean_tag($data['0'],$this->_file_encoding);
+ break;
+ case 'content_type':
+ $data['0'] = preg_replace("/^\(\d+\)/","",$data['0']);
+ $array['genre'] = $this->_clean_tag($data['0'],$this->_file_encoding);
+ break;
+ case 'comments':
+ $array['comment'] = $this->_clean_tag($data['0'],$this->_file_encoding);
+ break;
+ default:
+ $array[$tag] = $this->_clean_tag($data['0'],$this->_file_encoding);
+ break;
+ } // end switch on tag
} // end foreach