[Slim-Checkins] r8944 - in /trunk/server: Changelog6.html Slim/Display/Display.pm Slim/Player/Player.pm Slim/Player/Squeezebox.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Sat Aug 12 07:29:49 2006
New Revision: 8944

URL: http://svn.slimdevices.com?rev=8944&view=rev
Log:
Bug: 3877
Description: Avoid quickstart updates if displaying volume

Modified:
    trunk/server/Changelog6.html
    trunk/server/Slim/Display/Display.pm
    trunk/server/Slim/Player/Player.pm
    trunk/server/Slim/Player/Squeezebox.pm

Modified: trunk/server/Changelog6.html
URL: http://svn.slimdevices.com/trunk/server/Changelog6.html?rev=8944&r1=8943&r2=8944&view=diff
==============================================================================
--- trunk/server/Changelog6.html (original)
+++ trunk/server/Changelog6.html Sat Aug 12 07:29:49 2006
@@ -476,6 +476,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3869">#3869</a> - holding play button (rather than a quick tap) while browsing music folder, doesn't play</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3870">#3870</a> - Nokia770 skin doesn't show tooltip for unknown album artwork</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3874">#3874</a> - fishbone skin does not refresh playlist correctly</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3877">#3877</a> - Volume control display only appears very briefly when remote stream connecting</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3893">#3893</a> - changing sort by pulldown kicks you out to top level</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3898">#3898</a> - 'Now Playing' in web interface shows Artist and Album twice</li>
 	</ul>

Modified: trunk/server/Slim/Display/Display.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Display.pm?rev=8944&r1=8943&r2=8944&view=diff
==============================================================================
--- trunk/server/Slim/Display/Display.pm (original)
+++ trunk/server/Slim/Display/Display.pm Sat Aug 12 07:29:49 2006
@@ -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
 
@@ -118,6 +119,10 @@
 sub sbOldDisplay {
 	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 - so caller can name who owns current showBriefly
 	} 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);
@@ -267,6 +275,8 @@
 
 sub endShowBriefly {
 	my $display = shift;
+
+	$display->sbName(undef);
 
 	my $callbackData = $display->sbCallbackData() || return;
 

Modified: trunk/server/Slim/Player/Player.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Player.pm?rev=8944&r1=8943&r2=8944&view=diff
==============================================================================
--- trunk/server/Slim/Player/Player.pm (original)
+++ trunk/server/Slim/Player/Player.pm Sat Aug 12 07:29:49 2006
@@ -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);	
 }

Modified: trunk/server/Slim/Player/Squeezebox.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Squeezebox.pm?rev=8944&r1=8943&r2=8944&view=diff
==============================================================================
--- trunk/server/Slim/Player/Squeezebox.pm (original)
+++ trunk/server/Slim/Player/Squeezebox.pm Sat Aug 12 07:29:49 2006
@@ -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 );
 	}