Index: Slim/Display/Display.pm =================================================================== --- Slim/Display/Display.pm (revision 8871) +++ Slim/Display/Display.pm (working copy) @@ -66,6 +66,7 @@ $display->[7] = undef; # lastVisMode $display->[8] = undef; # sbCallbackData $display->[9] = undef; # sbOldDisplay + $display->[10]= undef; # sbName $display->resetDisplay(); # init render cache @@ -119,6 +120,10 @@ my $r = shift; @_ ? ($r->[9] = shift) : $r->[9]; } +sub sbName { + my $r = shift; + @_ ? ($r->[10] = shift) : $r->[10]; +} ################################################################################################ @@ -202,7 +207,7 @@ # return if update blocked return if ($display->updateMode() == 2); - my ($parsed, $duration, $firstLine, $blockUpdate, $scrollToEnd, $brightness, $callback, $callbackargs); + my ($parsed, $duration, $firstLine, $blockUpdate, $scrollToEnd, $brightness, $callback, $callbackargs, $name); my $parts = shift; if (ref($parts) eq 'HASH') { @@ -220,6 +225,7 @@ $brightness = $args->{'brightness'}; # brightness to display at $callback = $args->{'callback'}; # callback when showBriefly completes $callbackargs = $args->{'callbackargs'}; # callback arguments + $name = $args->{'name'}; # name of showBriefly caller } else { $duration = $args || 1; $firstLine = shift; @@ -228,6 +234,7 @@ $brightness = shift; $callback = shift; $callbackargs = shift; + $name = shift; } if ($firstLine && ($display->linesPerScreen() == 1)) { @@ -256,9 +263,10 @@ $callbackData->{'callback'} = $callback; $callbackData->{'callbackargs'} = $callbackargs; } - + $display->sbOldDisplay($oldDisplay); $display->sbCallbackData($callbackData); + $display->sbName($name); if (!$scrollToEnd || !$display->scrollData()) { Slim::Utils::Timers::setTimer($display,Time::HiRes::time() + $duration, \&endAnimation); @@ -268,6 +276,8 @@ sub endShowBriefly { my $display = shift; + $display->sbName(undef); + my $callbackData = $display->sbCallbackData() || return; if (defined(my $brightness = $callbackData->{'brightness'})) { Index: Slim/Player/Player.pm =================================================================== --- Slim/Player/Player.pm (revision 8871) +++ Slim/Player/Player.pm (working copy) @@ -706,7 +706,7 @@ }); # trim off any overlay for showBriefly - $client->display->showBriefly(@lines[0,1]); + $client->display->showBriefly(@lines[0,1], { 'name' => 'mixer' } ); $client->modeParam('visu', $oldvisu); } Index: Slim/Player/Squeezebox.pm =================================================================== --- Slim/Player/Squeezebox.pm (revision 8871) +++ Slim/Player/Squeezebox.pm (working copy) @@ -269,7 +269,7 @@ $line2 = Slim::Music::Info::title( $url ); } - $client->showBriefly( $line1, $line2, 0.5 ); + $client->showBriefly( $line1, $line2, 0.5 ) unless $client->display->sbName(); Slim::Utils::Timers::setTimer( $client, Time::HiRes::time() + 0.125, \&quickstart ); }