diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-10-19 05:27:39 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-10-19 05:27:39 +0000 |
| commit | b3634df51a7a6a75f30e3c18e2e90ca8d2034932 (patch) | |
| tree | 2a5e6467bec512dc8f9bbe88c00fd3b7eb2d956c | |
| parent | d45a743f64419e590a59cb1589abde773505c7d7 (diff) | |
| download | ampache-b3634df51a7a6a75f30e3c18e2e90ca8d2034932.tar.gz ampache-b3634df51a7a6a75f30e3c18e2e90ca8d2034932.tar.bz2 ampache-b3634df51a7a6a75f30e3c18e2e90ca8d2034932.zip | |
in theory a patch that allows getid3() to continue working even with some iconv() issues
| -rw-r--r-- | modules/id3/getid3/getid3.lib.php | 3 | ||||
| -rwxr-xr-x | modules/id3/vainfo.class.php | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/modules/id3/getid3/getid3.lib.php b/modules/id3/getid3/getid3.lib.php index b5146b7e..e435f7a4 100644 --- a/modules/id3/getid3/getid3.lib.php +++ b/modules/id3/getid3/getid3.lib.php @@ -953,6 +953,7 @@ class getid3_lib if ($in_charset == $out_charset) { return $string; } + if (!in_charset) { return $string; } static $iconv_broken_or_unavailable = array(); if (is_null(@$iconv_broken_or_unavailable[$in_charset.'_'.$out_charset])) { @@ -1320,4 +1321,4 @@ class getid3_lib } -?>
\ No newline at end of file +?> diff --git a/modules/id3/vainfo.class.php b/modules/id3/vainfo.class.php index 18a3ed4f..74d276d9 100755 --- a/modules/id3/vainfo.class.php +++ b/modules/id3/vainfo.class.php @@ -68,6 +68,7 @@ class vainfo { $this->_getID3->option_md5_data_source = false; $this->_getID3->option_tags_html = false; $this->_getID3->option_extra_info = false; + $this->_getID3->option_tag_lyrics3 = false; $this->_getID3->encoding = $this->encoding; /* Check for ICONV */ @@ -191,8 +192,8 @@ class vainfo { case 'id3v2': $results[$key] = $this->_parse_id3v2($tag_array); break; -// case 'ape': -// $results[$key] = $this->_parse_ape($tag_array); + case 'ape': + $results[$key] = $this->_parse_ape($tag_array); break; case 'quicktime': $results[$key] = $this->_parse_quicktime($tag_array); @@ -383,6 +384,13 @@ class vainfo { */ function _parse_ape($tags) { + foreach ($tags as $tag=>$data) { + + $array[$tag] = $this->_clean_tag($data['0'],$this->_file_encoding); + + } // end foreach tags + + return $array; } // _parse_ape |