Index: Slim/Utils/Prefs.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Utils/Prefs.pm,v
retrieving revision 1.88
diff -u -p -B -r1.88 Prefs.pm
--- Slim/Utils/Prefs.pm	23 Sep 2004 21:36:26 -0000	1.88
+++ Slim/Utils/Prefs.pm	3 Oct 2004 06:40:23 -0000
@@ -101,6 +101,7 @@ my %DEFAULT = (
 	,"refreshRate"			=> 30
 	,"displaytexttimeout"	=> 1.0
 	,"filesort"				=> 0
+	,"skipDRM"				=> 0
 	,"playtrackalbum"		=> 1
 	,"artistinalbumsearch"	=> 0
 	,"ignoredarticles"		=> "The El La Los Las Le Les"
Index: Slim/Web/Setup.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Web/Setup.pm,v
retrieving revision 1.106
diff -u -p -B -r1.106 Setup.pm
--- Slim/Web/Setup.pm	24 Sep 2004 01:45:21 -0000	1.106
+++ Slim/Web/Setup.pm	3 Oct 2004 06:40:26 -0000
@@ -1459,7 +1459,7 @@ sub initSetupConfig {
 			'Default' => {
 					'PrefOrder' => ['displaytexttimeout',
 							,'composerInArtists','playtrackalbum','artistinalbumsearch', 'ignoredarticles','splitchars','filesort'
-							,'groupdiscs','persistPlaylists','reshuffleOnRepeat','saveShuffled',
+							,'skipDRM','groupdiscs','persistPlaylists','reshuffleOnRepeat','saveShuffled',
 							,'savehistory','historylength','checkVersion']
 				}
 			}
@@ -1471,6 +1471,13 @@ sub initSetupConfig {
 								,'1' => string('SORTBYFILENAME')
 								}
 					}
+			,'skipDRM' => {
+						'validate' => \&validateTrueFalse
+						,'options' => {
+								'0' => string('INCLUDE_DRM')
+								,'1' => string('SKIP_DRM')
+								}
+					}
 			,'displaytexttimeout' => {
 						'validate' => \&validateNumber
 						,'validateArgs' => [0.1,undef,1]
Index: strings.txt
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/strings.txt,v
retrieving revision 1.139
diff -u -p -B -r1.139 strings.txt
--- strings.txt	2 Oct 2004 00:14:39 -0000	1.139
+++ strings.txt	3 Oct 2004 06:40:32 -0000
@@ -3171,6 +3171,18 @@ SORTBYFILENAME
 	PT	Ordenar por nome de ficheiro
 	SE	Sortera efter filnamn
 
+SETUP_SKIPDRM
+	EN	Skip DRM Files in Scan
+
+SETUP_SKIPDRM_DESC
+	EN	DRM Files are not playable by slimserver.  You may choose to include them in your library, having them flagged as DRM or you can choose to have them removed from your library. The file will always remain on your harddrive.
+
+INCLUDE_DRM
+	EN	Include DRM Files
+
+SKIP_DRM
+	EN	Remove DRM Files from Library
+
 SETUP_TEMPLATECACHE
 	DE	HTML im Cache ablegen
 	DK	Cache af HTML
Index: Slim/Music/Info.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Music/Info.pm,v
retrieving revision 1.149
diff -u -p -B -r1.149 Info.pm
--- Slim/Music/Info.pm	2 Oct 2004 20:13:47 -0000	1.149
+++ Slim/Music/Info.pm	3 Oct 2004 07:02:23 -0000
@@ -1309,7 +1309,8 @@ sub info {
 		} elsif (!isCached($file) || !cacheItem($file, 'TAG')) {
 			#$::d_info && Slim::Utils::Misc::bt();
 			$::d_info && Slim::Utils::Misc::msg("cache miss for $file\n");
-			$item = readTags($file)->{$tagname};
+			$item = readTags($file);
+			$item = $item->{$tagname} if $item;
 		}	
 	}
 	return $item;
@@ -2079,7 +2080,9 @@ sub readTags {
 				$tempCacheEntry = &{$tagFunctions{$type}}($filepath, $anchor);
 			}
 			$::d_info && !defined($tempCacheEntry) && Slim::Utils::Misc::msg("Info: no tags found for $filepath\n");
-
+			if ($tempCacheEntry->{'DRM'} && Slim::Utils::Prefs::get('skipDRM')) {
+				return undef;
+			}
 			if (defined($tempCacheEntry->{'TRACKNUM'})) {
 				$tempCacheEntry->{'TRACKNUM'} = cleanTrackNumber($tempCacheEntry->{'TRACKNUM'});
 			}