--- Music/Info.pm.old 2004-10-19 16:17:32.656250000 -0700 +++ Music/Info.pm 2004-10-19 16:20:51.375000000 -0700 @@ -2041,6 +2041,7 @@ sub isFragment { sub readTags { my $file = shift; + my $cacheEntry = shift; my ($track, $song, $artistName,$albumName); my $filepath; my $type; @@ -2082,7 +2083,8 @@ sub readTags { $tempCacheEntry = &{$tagFunctions{$type}}($filepath, $anchor); } $::d_info && !defined($tempCacheEntry) && Slim::Utils::Misc::msg("Info: no tags found for $filepath\n"); - + @tempCacheEntry{keys %{$cacheEntry}} = values %{$cacheEntry} if $cacheEntry; + if (defined($tempCacheEntry->{'TRACKNUM'})) { $tempCacheEntry->{'TRACKNUM'} = cleanTrackNumber($tempCacheEntry->{'TRACKNUM'}); } --- Formats/Parse.pm.old 2004-10-19 16:17:19.218750000 -0700 +++ Formats/Parse.pm 2004-10-19 16:21:14.437500000 -0700 @@ -297,10 +297,10 @@ sub parseCUE { $::d_parse && Slim::Utils::Misc::msg(" album: " . $cacheEntry->{'ALBUM'} . "\n"); } - Slim::Music::Info::readTags($url); - Slim::Music::Info::updateCacheEntry($url, $cacheEntry); - $cacheEntry = Slim::Music::Info::cacheEntry($url); #grab the merged info - Slim::Music::Info::updateGenreCache($url, $cacheEntry); + Slim::Music::Info::readTags($url,$cacheEntry); + #Slim::Music::Info::updateCacheEntry($url, $cacheEntry); + #$cacheEntry = Slim::Music::Info::cacheEntry($url); #grab the merged info + #Slim::Music::Info::updateGenreCache($url, $cacheEntry); }