diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/class/album.class.php | 5 | ||||
| -rw-r--r-- | lib/class/catalog.class.php | 4 | ||||
| -rwxr-xr-x | lib/class/vainfo.class.php | 7 | ||||
| -rw-r--r-- | lib/general.lib.php | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/lib/class/album.class.php b/lib/class/album.class.php index cb767b15..dc42aa2d 100644 --- a/lib/class/album.class.php +++ b/lib/class/album.class.php @@ -225,6 +225,11 @@ class Album { $this->year = "N/A"; } + // If we've got a disk append it + if ($this->disk) { + $this->f_name_link .= ' [' . _('Disk') . ' ' . $this->disk . ']'; + } + } // format /** diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index b9e5aefd..536be20f 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -953,7 +953,7 @@ class Catalog { $artist = $results['artist']; $album = $results['album']; $genre = $results['genre']; - $disk = $results['pos']; + $disk = $results['disk']; /* Clean up Old Vars */ unset($vainfo,$key); @@ -1893,7 +1893,7 @@ class Catalog { $size = $results['size']; $song_time = $results['time']; $track = $results['track']; - $disk = $results['pos']; + $disk = $results['disk']; $year = $results['year']; $comment = $results['comment']; $current_time = time(); diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php index bc1c27b6..517d4c30 100755 --- a/lib/class/vainfo.class.php +++ b/lib/class/vainfo.class.php @@ -303,12 +303,15 @@ class vainfo { /* go through them all! */ foreach ($tags as $tag=>$data) { - + /* We need to translate a few of these tags */ switch ($tag) { case 'tracknumber': $array['track'] = $this->_clean_tag($data['0']); break; + case 'discnumber': + $array['disk'] = $this->_clean_tag($data['0']); + break; case 'date': $array['year'] = $this->_clean_tag($data['0']); break; @@ -366,7 +369,7 @@ class vainfo { switch ($tag) { case 'pos': $el = split('/', $data['0']); - $array['pos'] = $el[0]; + $array['disk'] = $el[0]; break; case 'track_number': $array['track'] = $this->_clean_tag($data['0'],$this->_file_encoding); diff --git a/lib/general.lib.php b/lib/general.lib.php index 8a1f2eea..b83942ec 100644 --- a/lib/general.lib.php +++ b/lib/general.lib.php @@ -233,7 +233,7 @@ function clean_tag_info($results,$key,$filename) { $info['title'] = stripslashes(trim($results[$key]['title'])); $info['year'] = intval($results[$key]['year']); $info['track'] = intval($results[$key]['track']); - $info['pos'] = intval($results[$key]['pos']); + $info['disk'] = intval($results[$key]['disk']); $info['comment'] = Dba::escape(str_replace($clean_array,$wipe_array,$results[$key]['comment'])); /* This are pulled from the info array */ |