Index: Slim/Player/Squeezebox2.pm
===================================================================
--- Slim/Player/Squeezebox2.pm	(revision 2695)
+++ Slim/Player/Squeezebox2.pm	(working copy)
@@ -73,13 +73,14 @@
 #    5 - text + full screen spectrum analyser
 #    6 - text + indicator
 
-my @showBar =         (  0,   1,   0,   0,   0,   1,  1 );
-my @showTime =        (  0,   1,   0,   1,   1,   1,  0 );
-my @showFullness =    (  0,   0,   0,   0,   0,   0,  1 );
-my @displayWidth = 	  (  320, 320, 278, 278, 278, 320, 320  );
+my @showBar =         (    0,   1,   1,   0,   0,   0,   1,   1 );
+my @showTime =        (    0,   1,  -1,   0,   1,   1,   1,   0 );
+my @showFullness =    (    0,   0,   0,   0,   0,   0,   0,   1 );
+my @displayWidth = 	  (  320, 320, 320, 278, 278, 278, 320, 320  );
 
 my @visualizer =   	  (  	$VISUALIZER_NONE,
 				$VISUALIZER_NONE,
+				$VISUALIZER_NONE,
 				$VISUALIZER_VUMETER,   
 				$VISUALIZER_VUMETER,   
 				$VISUALIZER_SPECTRUM_ANALYZER,   
@@ -88,6 +89,7 @@
 
 my @visualizerParameters = ( 	[],
 				[], 
+				[], 
 				[0, 0, 280, 18, 302, 18], 
 				[0, 0, 280, 18, 302, 18], 
 				[1, 1, 0x10000, 280, 40, 0, 4, 1, 0, 1, 3], 
@@ -101,13 +103,14 @@
 	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')
+		,'2' => $client->string('REMAINING') . ' ' . $client->string('AND') . ' ' . $client->string('PROGRESS_BAR')
+		,'3' => $client->string('VISUALIZER_VUMETER_SMALL')
+		,'4' => $client->string('ELAPSED') . ' ' . $client->string('AND') . ' ' . $client->string('VISUALIZER_VUMETER_SMALL')
+		,'5' => $client->string('ELAPSED') . ' ' . $client->string('AND') . ' ' . $client->string('VISUALIZER_SPECTRUM_ANALYZER_SMALL')
+		,'6' => $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');
+	$options{'7'} = $client->string('SETUP_SHOWBUFFERFULLNESS') if Slim::Utils::Prefs::clientGet($client,'showbufferfullness');
 	
 	return \%options;
 }
@@ -383,7 +386,7 @@
 	if ($showFullness) {
 		$songtime = ' ' . int($fractioncomplete * 100 + 0.5)."%";
 	} elsif ($showTime) { 
-		$songtime = ' ' . $client->textSongTime();
+		$songtime = ' ' . $client->textSongTime($showTime == -1);
 	}
 
 	if ($showTime || $showFullness) {