diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-08-19 04:31:52 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-08-19 04:31:52 +0000 |
| commit | a6a8c08e3721962fd2dc5cfdc6efc1803e844a2b (patch) | |
| tree | 0a2b14b3029bb3e5bef45af452d10127c0337127 /lib/class/vainfo.class.php | |
| parent | 619368f183a2c652f8ac40a83d847c608187e53d (diff) | |
| download | ampache-a6a8c08e3721962fd2dc5cfdc6efc1803e844a2b.tar.gz ampache-a6a8c08e3721962fd2dc5cfdc6efc1803e844a2b.tar.bz2 ampache-a6a8c08e3721962fd2dc5cfdc6efc1803e844a2b.zip | |
fixed the search a bit, made some random changes to charset and fixed some echo printf() references
Diffstat (limited to 'lib/class/vainfo.class.php')
| -rw-r--r-- | lib/class/vainfo.class.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php index 1997a54f..694c19b6 100644 --- a/lib/class/vainfo.class.php +++ b/lib/class/vainfo.class.php @@ -68,7 +68,7 @@ class vainfo { $this->_getID3->option_tags_html = false; $this->_getID3->option_extra_info = false; $this->_getID3->option_tag_lyrics3 = false; -// $this->_getID3->encoding = $this->encoding; + $this->_getID3->encoding = $this->encoding; $this->_getID3->option_tags_process = true; /* Check for ICONV */ @@ -173,7 +173,7 @@ class vainfo { $results[$key] = $this->_parse_id3v1($tag_array); break; case 'id3v2': - $results[$key] = $this->_parse_id3v2($this->_raw['id3v2']['comments']); + $results[$key] = $this->_parse_id3v2($tag_array); break; case 'ape': $results[$key] = $this->_parse_ape($tag_array); @@ -356,12 +356,10 @@ class vainfo { $array['comment'] = $this->_clean_tag($data['0'],''); break; case 'title': - $array['title'] = $this->_clean_tag($data['0'],$this->_raw['id3v2']['TIT2']['0']['encoding']); + $array['title'] = $this->_clean_tag($data['0'],''); break; default: - $frame = $this->_id3v2_tag_to_frame($tag); - $encoding = $frame ? $this->_raw['id3v2'][$frame]['0']['encoding'] : ''; - $array[$tag] = $this->_clean_tag($data['0'],$encoding); + $array[$tag] = $this->_clean_tag($data['0'],''); break; } // end switch on tag |