diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-10-21 21:09:50 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-10-21 21:09:50 +0000 |
| commit | 7b49a436d0eb128b26cb2a427731074f0a9fce2b (patch) | |
| tree | 9253d2ed30ec0ab1d8979464fe8fc845d0103b73 /modules/id3/vainfo.class.php | |
| parent | 7935a4a78558ed918e009d9a3f84f242dfaa88ea (diff) | |
| download | ampache-7b49a436d0eb128b26cb2a427731074f0a9fce2b.tar.gz ampache-7b49a436d0eb128b26cb2a427731074f0a9fce2b.tar.bz2 ampache-7b49a436d0eb128b26cb2a427731074f0a9fce2b.zip | |
patched flaw in getid3() fixed a problem with vainfo and songs with no tags and fixed the xml_from_array() function
Diffstat (limited to 'modules/id3/vainfo.class.php')
| -rwxr-xr-x | modules/id3/vainfo.class.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/modules/id3/vainfo.class.php b/modules/id3/vainfo.class.php index 74d276d9..c6192ded 100755 --- a/modules/id3/vainfo.class.php +++ b/modules/id3/vainfo.class.php @@ -170,6 +170,9 @@ class vainfo { $results = array(); + /* Gather Tag information from the filenames */ + $results['file'] = $this->_parse_filename($this->filename); + /* Return false if we don't have * any tags to look at */ @@ -206,9 +209,6 @@ class vainfo { } // end foreach - /* Gather Tag information from the filenames */ - $results['file'] = $this->_parse_filename($this->filename); - return $results; } // _get_tags @@ -358,9 +358,8 @@ class vainfo { 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); + //case 'content_type': + // $array['genre'] = $this->_clean_tag($data['0'],$this->_file_encoding); break; case 'comments': $array['comment'] = $this->_clean_tag($data['0'],$this->_file_encoding); |