--- strings.txt.old	2004-09-23 06:50:00.000000000 -0700
+++ strings.txt	2004-09-23 06:50:00.000000000 -0700
@@ -5887,6 +5873,9 @@ ELAPSED
 	PT	Tempo Tocado
 	SE	Förfluten tid
 
+TIME
+	EN	Current Time
+
 PROGRESS_BAR
 	DE	Verlaufsanzeige
 	DK	Tids-bjælke
diff -upBr Slim.old/Buttons/Common.pm Slim/Buttons/Common.pm
--- Slim.old/Buttons/Common.pm	2004-09-01 01:27:00.000000000 -0700
+++ Slim/Buttons/Common.pm	2004-09-29 08:07:00.000000000 -0700
@@ -329,7 +317,7 @@ my %functions = (
 				$client->showBriefly(string('VIEWING_PLAYLIST'), "");
 			}
 		} else {
-			if ($buttonarg =~ /^[0-5]$/) {
+			if ($buttonarg =~ /^[0-8]$/) {
 				Slim::Utils::Prefs::clientSet($client, "playingDisplayMode", $buttonarg);
 			}
 		}
diff -upBr Slim.old/Buttons/Playlist.pm Slim/Buttons/Playlist.pm
--- Slim.old/Buttons/Playlist.pm	2004-09-13 18:44:00.000000000 -0700
+++ Slim/Buttons/Playlist.pm	2004-09-29 08:11:00.000000000 -0700
@@ -34,16 +34,19 @@ my %functions = (
 			# 0 show nothing
 			# 1 show elapsed time
 			# 2 show remaining time
-			# 3 show progress bar
-			# 4 show elapsed time and progress bar
-			# 5 show remaining time and progress bar
+			# 3 show current time
+			# 4 show progress bar
+			# 5 show elapsed time and progress bar
+			# 6 show remaining time and progress bar
+			# 7 show current time and progress bar
+			# 8 show buffer fullnes (if enabled)
 			if (($playlistlen > 0) && (showingNowPlaying($client))) {
-				$pdm = ($pdm + 1) % (Slim::Utils::Prefs::clientGet($client,'showbufferfullness') ? 7 : 6);
+				$pdm = ($pdm + 1) % (Slim::Utils::Prefs::clientGet($client,'showbufferfullness') ? 9 : 8);
 			} elsif ($playlistlen > 0) {
 				browseplaylistindex($client,Slim::Player::Source::currentSongIndex($client));
 			}
 		} else {
-			if ($buttonarg =~ /[0-5]$/) {
+			if ($buttonarg =~ /[0-8]$/) {
 				$pdm = $buttonarg;
 			}
 		}
diff -upBr Slim.old/Player/Player.pm Slim/Player/Player.pm
--- Slim.old/Player/Player.pm	2004-09-24 01:45:00.000000000 -0700
+++ Slim/Player/Player.pm	2004-09-29 08:16:00.000000000 -0700
@@ -479,19 +478,27 @@ sub nowPlayingModeLines {
 	};
 
 	# check if we don't know how long the track is...
-	if (!$client->songduration() && ($playingDisplayMode != 6)) {
+	if (!$client->songduration() && ($playingDisplayMode != 8)) {
 		# no progress bar, remaining time is meaningless
-		$playingDisplayMode = ($playingDisplayMode % 3) ? 1 : 0;
+		if ($playingDisplayMode == 7 || $playingDisplayMode == 3) {
+			$playingDisplayMode = 3;
+		} else {
+			$playingDisplayMode = ($playingDisplayMode % 4) ? 1 : 0;
+		}
 
 	} else {
 		$fractioncomplete = Slim::Player::Source::progress($client);
 	}
 
 	my $songtime = " " . Slim::Player::Source::textSongTime($client, $playingDisplayMode);
-
+	
 	my $leftLength = $client->measureText($line1, 1);
 
-	if ( $playingDisplayMode == 6) {
+	if ($playingDisplayMode == 3 || $playingDisplayMode == 7) {
+		$songtime = " ".Slim::Utils::Misc::timeF();
+	}
+	
+	if ( $playingDisplayMode == 8) {
 		if (!Slim::Utils::Prefs::clientGet($client,'showbufferfullness')) {
 			$playingDisplayMode = 1; #sanity check.  revert to showing nothign is showbufferfullnes has been turned off.
 		} else {
@@ -507,10 +514,10 @@ sub nowPlayingModeLines {
 		}
 	}
 	
-	if ($playingDisplayMode == 1 || $playingDisplayMode == 2) {
+	if ($playingDisplayMode >= 1 && $playingDisplayMode <= 3) {
 		$overlay = $songtime;
 
-	} elsif ($playingDisplayMode == 3) {
+	} elsif ($playingDisplayMode == 4) {
 
 		# just show the bar
 		my $barlen = $client->displayWidth() - $leftLength;
@@ -518,7 +525,7 @@ sub nowPlayingModeLines {
 
 		$overlay = $bar;
 
-	} elsif ($playingDisplayMode == 4 || $playingDisplayMode == 5) {
+	} elsif ($playingDisplayMode >= 5 && $playingDisplayMode <= 7) {
 
 		# show both the bar and the time
 		my $barlen = $client->displayWidth() - $leftLength - $client->measureText($songtime, 1);
diff -upBr Slim.old/Player/Source.pm Slim/Player/Source.pm
--- Slim.old/Player/Source.pm	2004-09-23 21:59:00.000000000 -0700
+++ Slim/Player/Source.pm	2004-09-24 02:29:00.000000000 -0700
@@ -251,7 +251,7 @@ sub textSongTime {
 	}
 	
 	# 2 and 5 display remaining time, not elapsed
-	if ($playingDisplayMode % 3 == 2) {
+	if ($playingDisplayMode % 4 == 2) {
 		my $duration = $client->songduration() || 0;
 		if ($duration) {
 			$delta = $duration - $delta;	
diff -upBr Slim.old/Web/Setup.pm Slim/Web/Setup.pm
--- Slim.old/Web/Setup.pm	2004-09-24 02:29:00.000000000 -0700
+++ Slim/Web/Setup.pm	2004-09-24 02:29:00.000000000 -0700
@@ -125,11 +125,11 @@ sub initSetupConfig {
 					}
 					
 					if (Slim::Utils::Prefs::clientGet($client,'showbufferfullness')) {
-					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'options'}{'6'} =  string('SETUP_SHOWBUFFERFULLNESS');
-					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,6,1,1];
+					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'options'}{'8'} =  string('SETUP_SHOWBUFFERFULLNESS');
+					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,8,1,1];
 					} else {
 						delete $pageref->{'Prefs'}{'playingDisplayMode'}{'options'}{'6'};
-					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,5,1,1];
+					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,7,1,1];
 					}
 
 					$pageref->{'Prefs'}{'playername'}{'validateArgs'} = [$client->defaultName()];
@@ -150,11 +150,11 @@ sub initSetupConfig {
 					$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];
+					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'options'}{'8'} =  string('SETUP_SHOWBUFFERFULLNESS');
+					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,8,1,1];
 					} else {
-						delete $pageref->{'Prefs'}{'playingDisplayMode'}{'options'}{'6'};
-					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,5,1,1];
+						delete $pageref->{'Prefs'}{'playingDisplayMode'}{'options'}{'8'};
+					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,7,1,1];
 					}
 					$client->update();
 				}
@@ -208,15 +208,17 @@ sub initSetupConfig {
 						}
 			,'playingDisplayMode' 	=> {
 							'validate' => \&validateInt
-							,'validateArgs' => [0,6,1,1]
+							,'validateArgs' => [0,8,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')
+									,'3' => string('TIME')
+									,'4' => string('PROGRESS_BAR')
+									,'5' => string('ELAPSED') . ' ' . string('AND') . ' ' . string('PROGRESS_BAR')
+									,'6' => string('REMAINING') . ' ' . string('AND') . ' ' . string('PROGRESS_BAR')
+									,'7' => string('TIME') . ' ' . string('AND') . ' ' . string('PROGRESS_BAR')
+									,'8' => string('SETUP_SHOWBUFFERFULLNESS')
 									}
 							,'PrefChoose' => string('SETUP_PLAYINGDISPLAYMODE').string('COLON')
 						}