summaryrefslogtreecommitdiffstats
path: root/modules/id3
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-01-02 04:47:15 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-01-02 04:47:15 +0000
commita9d8f3fa746bf57dd40bc17793a84d4841e1003d (patch)
treec468439da9483b5f2852e7baa8635715de0307c9 /modules/id3
parent8b81ef709679d69ce47440fd48c76a0e3f6f903b (diff)
downloadampache-a9d8f3fa746bf57dd40bc17793a84d4841e1003d.tar.gz
ampache-a9d8f3fa746bf57dd40bc17793a84d4841e1003d.tar.bz2
ampache-a9d8f3fa746bf57dd40bc17793a84d4841e1003d.zip
* Updated the PO files for the translations, this should be the final for the next stable
* Added German prefixes for artists * Added RIFF tag support
Diffstat (limited to 'modules/id3')
-rwxr-xr-xmodules/id3/vainfo.class.php28
1 files changed, 28 insertions, 0 deletions
diff --git a/modules/id3/vainfo.class.php b/modules/id3/vainfo.class.php
index a19fdf96..0c3d1434 100755
--- a/modules/id3/vainfo.class.php
+++ b/modules/id3/vainfo.class.php
@@ -201,6 +201,9 @@ class vainfo {
case 'quicktime':
$results[$key] = $this->_parse_quicktime($tag_array);
break;
+ case 'riff':
+ $results[$key] = $this->_parse_riff($tag_array);
+ break;
default:
debug_event('vainfo','Error: Unable to determine tag type of ' . $key . ' for file ' . $this->filename . ' Assuming id3v2','5');
$results[$key] = $this->_parse_id3v2($tag_array);
@@ -263,6 +266,7 @@ class vainfo {
switch ($type) {
case 'mp3':
+ case 'mp2':
case 'mpeg3':
return 'mp3';
break;
@@ -394,6 +398,30 @@ class vainfo {
} // _parse_ape
/**
+ * _parse_riff
+ * this function takes the riff take information passed by getid3() and
+ * then reformats it so that it matches the other formats. May require iconv
+ */
+ function _parse_riff($tags) {
+
+ foreach ($tags as $tag=>$data) {
+
+ switch ($tag) {
+ case 'product':
+ $array['album'] = $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
+
+ } // foreach tags
+
+ return $array;
+
+ } // _parse_riff
+
+ /**
* _parse_quicktime
* this function takes the quicktime tags set by getid3() and then
* returns the elements translated using iconv if needed in a