Index: Info.pm
===================================================================
RCS file: /cvsroot/slim/server/Slim/Music/Info.pm,v
retrieving revision 1.154.2.4
diff -u -r1.154.2.4 Info.pm
--- Info.pm	4 Jan 2005 02:33:35 -0000	1.154.2.4
+++ Info.pm	5 Jan 2005 05:26:59 -0000
@@ -113,7 +113,7 @@
 # a cache of the titles used for uniquely identifing and sorting items 
 my %caseCache = ();
 
-my %sortCache = ();
+%Slim::Music::Info::sortCache = ();
 
 # the main cache of ID3 and other metadata
 my %infoCache = ();
@@ -176,7 +176,7 @@
 					'infoCache'           => \%infoCache,
 					'songCount'           => \$songCount,
 					'songCountMemoize'    => \%songCountMemoize,
-					'sortCache'           => \%sortCache,
+					'sortCache'           => \%Slim::Music::Info::sortCache,
 					'total_time'          => \$total_time,
 					'playlists'           => \@playlists,
 					'ver'                 => $DBVERSION,
@@ -250,7 +250,7 @@
 				%genreMixCache       = %{$cacheToRead->{'genreMixCache'}};
 				%infoCache           = %{$cacheToRead->{'infoCache'}};
 				%songCountMemoize    = %{$cacheToRead->{'songCountMemoize'}};
-				%sortCache           = %{$cacheToRead->{'sortCache'}};
+				%Slim::Music::Info::sortCache = %{$cacheToRead->{'sortCache'}};
 				$songCount           = ${$cacheToRead->{'songCount'}};
 				@playlists           = @{$cacheToRead->{'playlists'}};
 				$total_time          = ${$cacheToRead->{'total_time'}};
@@ -511,7 +511,7 @@
 	# a hierarchical cache of genre->artist->album->song based on ID3 information
 	%genreCache = ();
 	%caseCache = ();
-	%sortCache = ();
+	%Slim::Music::Info::sortCache = ();
 	%artworkCache = ();
 		
 	%songCountMemoize=();
@@ -2212,7 +2212,7 @@
 		$tempCacheEntry->{'ARTISTSORT'} = Slim::Utils::Text::ignoreCaseArticles($tempCacheEntry->{'ARTISTSORT'});
 		
 		if (exists($tempCacheEntry->{'ARTIST'})) { 
-			$sortCache{Slim::Utils::Text::ignoreCaseArticles($tempCacheEntry->{'ARTIST'})} = $tempCacheEntry->{'ARTISTSORT'};
+			$Slim::Music::Info::sortCache{Slim::Utils::Text::ignoreCaseArticles($tempCacheEntry->{'ARTIST'})} = $tempCacheEntry->{'ARTISTSORT'};
 		};
 	};
 			
@@ -2220,7 +2220,7 @@
 		$tempCacheEntry->{'ALBUMSORT'} = Slim::Utils::Text::ignoreCaseArticles($tempCacheEntry->{'ALBUMSORT'});
 				
 		if (exists($tempCacheEntry->{'ALBUM'})) { 
-			$sortCache{Slim::Utils::Text::ignoreCaseArticles($tempCacheEntry->{'ALBUM'})} = $tempCacheEntry->{'ALBUMSORT'};
+			$Slim::Music::Info::sortCache{Slim::Utils::Text::ignoreCaseArticles($tempCacheEntry->{'ALBUM'})} = $tempCacheEntry->{'ALBUMSORT'};
 		};
 	};
 			
@@ -2228,7 +2228,7 @@
 		$tempCacheEntry->{'TITLESORT'} = Slim::Utils::Text::ignoreCaseArticles($tempCacheEntry->{'TITLESORT'});
 
 		if (exists($tempCacheEntry->{'TITLE'})) { 
-			$sortCache{Slim::Utils::Text::ignoreCaseArticles($tempCacheEntry->{'TITLE'})} = $tempCacheEntry->{'TITLESORT'};
+			$Slim::Music::Info::sortCache{Slim::Utils::Text::ignoreCaseArticles($tempCacheEntry->{'TITLE'})} = $tempCacheEntry->{'TITLESORT'};
 		};
 	};
 }