Only in server/Slim/Hardware: IR.pm.orig
Only in server/Slim/Hardware: IR.pm.rej
diff -upBr Slim/Player/Player.pm server/Slim/Player/Player.pm
--- Slim/Player/Player.pm	2005-03-17 09:12:00.000000000 -0800
+++ server/Slim/Player/Player.pm	2005-03-21 12:49:25.781250000 -0800
@@ -526,10 +526,26 @@ sub currentSongLines {
 	return $parts;
 }
 
+sub playingModeOptions { 
+	my $client = shift;
+	my %options = (
+		'0' => $client->string('BLANK')
+		,'1' => $client->string('ELAPSED')
+		,'2' => $client->string('REMAINING')
+		,'3' => $client->string('PROGRESS_BAR')
+		,'4' => $client->string('ELAPSED') . ' ' . $client->string('AND') . ' ' . $client->string('PROGRESS_BAR')
+		,'5' => $client->string('REMAINING') . ' ' . $client->string('AND') . ' ' . $client->string('PROGRESS_BAR')
+	);
+	
+	$options{'6'} = $client->string('SETUP_SHOWBUFFERFULLNESS') if Slim::Utils::Prefs::clientGet($client,'showbufferfullness');
+	
+	return \%options;
+}
+
 sub nowPlayingModes {
 	my $client = shift;
-	my $count = Slim::Utils::Prefs::clientGet($client,'showbufferfullness') ? 7 : 6;
-	return $count;
+	
+	return scalar(keys %{$client->playingModeOptions()});
 }
 
 sub nowPlayingModeLines {
diff -upBr Slim/Player/Squeezebox2.pm server/Slim/Player/Squeezebox2.pm
--- Slim/Player/Squeezebox2.pm	2005-03-18 07:58:00.000000000 -0800
+++ server/Slim/Player/Squeezebox2.pm	2005-03-21 12:48:30.468750000 -0800
@@ -95,6 +95,23 @@ my @visualizerParameters = ( 	[],
 				[],
 );
 
+
+sub playingModeOptions { 
+	my $client = shift;
+	my %options = (
+		'0' => $client->string('BLANK')
+		,'1' => $client->string('ELAPSED') . ' ' . $client->string('AND') . ' ' . $client->string('PROGRESS_BAR')
+		,'2' => $client->string('VISUALIZER_VUMETER_SMALL')
+		,'3' => $client->string('ELAPSED') . ' ' . $client->string('AND') . ' ' . $client->string('VISUALIZER_VUMETER_SMALL')
+		,'4' => $client->string('ELAPSED') . ' ' . $client->string('AND') . ' ' . $client->string('VISUALIZER_SPECTRUM_ANALYZER_SMALL')
+		,'5' => $client->string('ELAPSED') . ', ' . $client->string('PROGRESS_BAR') . ' ' . $client->string('AND') . ' ' . $client->string('VISUALIZER_SPECTRUM_ANALYZER')
+	);
+	
+	$options{'6'} = $client->string('SETUP_SHOWBUFFERFULLNESS') if Slim::Utils::Prefs::clientGet($client,'showbufferfullness');
+	
+	return \%options;
+}
+
 sub new {
 	my $class = shift;
 
@@ -118,9 +135,8 @@ sub init {
 
 sub nowPlayingModes {
 	my $client = shift;
-	my $count = scalar(@showBar);
-	$count += Slim::Utils::Prefs::clientGet($client,'showbufferfullness') ? 1 : 0;
-	return $count;
+	
+	return scalar(keys %{$client->playingModeOptions()});
 }
 
 sub displayWidth {
Only in server/Slim/Web: Pages.pm.old
diff -upBr Slim/Web/Setup.pm server/Slim/Web/Setup.pm
--- Slim/Web/Setup.pm	2005-03-21 09:01:00.000000000 -0800
+++ server/Slim/Web/Setup.pm	2005-03-21 12:44:02.343750000 -0800
@@ -153,13 +153,10 @@ sub initSetupConfig {
 					$paramref->{'ipaddress'} = $client->ipport();
 					$paramref->{'macaddress'} = $client->macaddress;
 					$paramref->{'signalstrength'} = $client->signalStrength;
-					if (Slim::Utils::Prefs::clientGet($client,'showbufferfullness')) {
-					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'options'}{'6'} =  string('SETUP_SHOWBUFFERFULLNESS');
-					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,6,1,1];
-					} else {
-						delete $pageref->{'Prefs'}{'playingDisplayMode'}{'options'}{'6'};
-					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,5,1,1];
-					}
+
+					$pageref->{'Prefs'}{'playingDisplayMode'}{'options'} = $client->playingModeOptions();
+					$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,scalar($pageref->{'Prefs'}{'playingDisplayMode'}{'options'}),1,1];
+
 					$client->update();
 				}
 		#,'template' => 'setup_player.html'
@@ -214,16 +211,9 @@ sub initSetupConfig {
 			,'playingDisplayMode' 	=> {
 							'validate' => \&validateInt
 							,'validateArgs' => [0,6,1,1]
-							,'options' => {
-									'0' => string('BLANK')
-									,'1' => string('ELAPSED')
-									,'2' => string('REMAINING')
-									,'3' => string('PROGRESS_BAR')
-									,'4' => string('ELAPSED') . ' ' . string('AND') . ' ' . string('PROGRESS_BAR')
-									,'5' => string('REMAINING') . ' ' . string('AND') . ' ' . string('PROGRESS_BAR')
-									,'6' => string('SETUP_SHOWBUFFERFULLNESS')
-									}
+							,'options' => undef
 							,'PrefChoose' => string('SETUP_PLAYINGDISPLAYMODE').string('COLON')
+							,'onChange'   => sub { shift->visualizer(); }
 						}
 			,'showbufferfullness' => {
 						'validate' => \&validateTrueFalse
Only in server/Slim/Web: bug971.diff
--- strings.txt	2005-03-18 07:58:00.000000000 -0800
+++ server/strings.txt	2005-03-21 10:43:47.359375000 -0800
@@ -7236,6 +7236,18 @@ CHOOSE_PLAYING_DISPLAY_MODE
 	PT	O cliente pode mostrar informações da música actual a tocar. Escolha a informação a mostrar.
 	SE	Spelaren kan visa information om aktuell låt. Välj vilken information som skall visas.
 
+VISUALIZER_SPECTRUM_ANALYZER_SMALL
+	EN	Small Spectrum
+
+VISUALIZER_VUMETER_SMALL
+	EN	Small VU
+
+VISUALIZER_SPECTRUM_ANALYZER
+	EN	Spectrum
+
+VISUALIZER_VUMETER
+	EN	VU Meter
+
 BLANK
 	DE	Nichts
 	DK	Intet