--- Slim/Player/SqueezeboxG.pm.old	2004-10-20 05:43:00.000000000 -0700
+++ Slim/Player/SqueezeboxG.pm	2004-10-20 16:34:16.078125000 -0700
@@ -381,6 +381,37 @@ sub drawFrameBuf {
 	}
 }	
 
+Slim::Buttons::Common::addMode('showbriefly',getFunctions(),\&setMode);
+
+my %functions = (
+	'passback' => sub {
+			my ($client,$funct,$functarg) = @_;
+			Slim::Buttons::Common::popMode($client);
+			my $mode = Slim::Buttons::Common::mode($client);
+			if (defined($mode)) {
+				Slim::Hardware::IR::executeButton($client,$client->lastirbutton,$client->lastirtime,$mode);
+			}
+		}
+);
+
+sub getFunctions {
+	return \%functions;
+}
+
+sub setMode {
+	my $client = shift;
+	my $pop = shift;
+	
+	if ($pop eq "pop") {
+		Slim::Buttons::Common::popMode($client);
+		return;
+	}
+	
+	$client->lines(Slim::Buttons::Common::param($client, 'lines'));
+	$client->update();
+	Slim::Utils::Timers::setTimer($client,Time::HiRes::time() + Slim::Buttons::Common::param($client, 'duration'),\&showDone);
+}
+
 sub showBriefly {
 	my $client = shift;
 	my $line1 = shift;
@@ -392,28 +423,19 @@ sub showBriefly {
 	$client->killAnimation();
 	
 	my %line = (func => sub {return ($line1,$line2)});
-	my $linefunc  = $client->lines();
 
 	if (!$duration) {
 		$duration = 1;
 	}
-
-	$client->lines(\&{$line{func}});
-	$client->update();
-	if (Slim::Utils::Timers::pendingTimers($client, \&showDone) > 0) {
-		Slim::Utils::Timers::resetTimer($client,\&showDone,Time::HiRes::time() + $duration);
-	} else {
-		Slim::Utils::Timers::setTimer($client,Time::HiRes::time() + $duration,\&showDone,$linefunc);
-	}
+	Slim::Buttons::Common::popMode($client) if (Slim::Buttons::Common::mode($client) eq 'showbriefly');
+	Slim::Utils::Timers::killTimers($client,\&showDone);
+	Slim::Buttons::Common::pushMode($client,'showbriefly',{'duration' => $duration,'lines' => \&{$line{func}}});
 }
 
 sub showDone {
 	my $client = shift;
-	my $linefunc = shift;
-	
-	if (defined $linefunc && &$linefunc($client) ne "") {
-			$client->lines($linefunc);
-	}
+
+	Slim::Buttons::Common::popMode($client) if (Slim::Buttons::Common::mode($client) eq 'showbriefly');
 	$client->update();
 }
 
--- IR/Default.map.old	2004-09-02 07:47:00.000000000 -0700
+++ IR/Default.map	2004-10-20 10:22:35.625000000 -0700
@@ -45,18 +45,6 @@ voldown					= volume_down
 voldown.repeat			= volume_down
 volup					= volume_up
 volup.repeat			= volume_up
-pitchdown				= pitch_down
-pitchdown.repeat		= pitch_down
-pitchup					= pitch_up
-pitchup.repeat			= pitch_up
-bassdown				= bass_down
-bassdown.repeat			= bass_down
-bassup					= bass_up
-bassup.repeat			= bass_up
-trebledown				= treble_down
-trebledown.repeat		= treble_down
-trebleup				= treble_up
-trebleup.repeat			= treble_up
 
 # playing display modes
 now_playing				= playdisp_toggle
@@ -274,7 +262,7 @@ play						= exit_play
 add.*						= dead
 add						= exit_add
 
-[INPUT.List]
+[input]
 arrow_left					= exit_left
 arrow_right					= exit_right
 play.*						= passback
@@ -283,11 +271,11 @@ search.*					= passback
 stop.*						= passback
 pause.*						= passback
 
-[INPUT.Bar]
-arrow_left					= exit_left
-arrow_right					= exit_right
+[showbriefly]
+arrow_left					= passback
+arrow_right					= passback
 play.*						= passback
 add.*						= passback
 search.*					= passback
 stop.*						= passback
-pause.*						= passback
+pause.*						= passback
\ No newline at end of file