Index: IR/Default.map
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/IR/Default.map,v
retrieving revision 1.14
diff -u -p -B -r1.14 Default.map
--- IR/Default.map	28 Aug 2004 04:58:22 -0000	1.14
+++ IR/Default.map	21 Oct 2004 06:11:26 -0000
@@ -291,3 +291,14 @@ add.*						= passback
 search.*					= passback
 stop.*						= passback
 pause.*						= passback
+
+[showbriefly]
+arrow_up				= passback
+arrow_down				= passback
+arrow_left				= passback
+arrow_right				= passback
+play.*					= passback
+add.*					= passback
+search.*				= passback
+stop.*					= passback
+pause.*					= passback
\ No newline at end of file
Index: Slim/Player/SqueezeboxG.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Player/SqueezeboxG.pm,v
retrieving revision 1.15
diff -u -p -B -r1.15 SqueezeboxG.pm
--- Slim/Player/SqueezeboxG.pm	25 Sep 2004 00:47:55 -0000	1.15
+++ Slim/Player/SqueezeboxG.pm	21 Oct 2004 06:11:27 -0000
@@ -381,6 +381,38 @@ 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;
@@ -388,14 +420,25 @@ sub showBriefly {
 	my $duration = shift;
 	my $firstLineIfDoubled = shift;
 	my @lines = [$line1,$line2];
-
-	$client->update(@lines);
+	
+	$client->killAnimation();
+	
+	my %line = (func => sub {return ($line1,$line2)});
 
 	if (!$duration) {
 		$duration = 1;
 	}
 
-	Slim::Utils::Timers::setTimer($client,Time::HiRes::time() + $duration,\&update)
+	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;
+
+	Slim::Buttons::Common::popMode($client) if (Slim::Buttons::Common::mode($client) eq 'showbriefly');
+	$client->update();
 }
 
 # push the old screen off the left side