[Slim-Checkins] r9305 - in /branches/6.5/server/Slim: Display/Transporter.pm Player/Player.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Wed Aug 30 17:05:49 2006
New Revision: 9305

URL: http://svn.slimdevices.com?rev=9305&view=rev
Log:
Bug: N/A
Description: merge -r 9302:9304 from trunk

Modified:
    branches/6.5/server/Slim/Display/Transporter.pm
    branches/6.5/server/Slim/Player/Player.pm

Modified: branches/6.5/server/Slim/Display/Transporter.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Display/Transporter.pm?rev=9305&r1=9304&r2=9305&view=diff
==============================================================================
--- branches/6.5/server/Slim/Display/Transporter.pm (original)
+++ branches/6.5/server/Slim/Display/Transporter.pm Wed Aug 30 17:05:49 2006
@@ -300,7 +300,6 @@
 	my $display = shift;
 	my $client = $display->client;
 
-	return 1 if ($client->param('visu'));
 	return 0 if (!$client->power());
 
 	my $visu = $client->prefGet('visualModes', $client->prefGet('visualMode')) || 0;

Modified: branches/6.5/server/Slim/Player/Player.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Player.pm?rev=9305&r1=9304&r2=9305&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Player.pm (original)
+++ branches/6.5/server/Slim/Player/Player.pm Wed Aug 30 17:05:49 2006
@@ -696,8 +696,7 @@
 	my $scale = $client->mixerConstant($feature, 'scale');
 
 	my $headerValue = '';
-	my $parts;
-	my $oldvisu;
+	my ($parts, $oldvisu, $savedvisu);
 
 	if ($client->mixerConstant($feature, 'balanced')) {
 
@@ -730,6 +729,7 @@
 	if (blessed($client->display) eq 'Slim::Display::Squeezebox2') {
 		# XXXX hack attack: turn off visualizer when showing volume, etc.		
 		$oldvisu = $client->modeParam('visu');
+		$savedvisu = 1;
 		$client->modeParam('visu', [0]);
 	}
 
@@ -743,7 +743,7 @@
 	$client->display->showBriefly($parts, { 'name' => 'mixer' } );
 
 	# Turn the visualizer back to it's old value.
-	if (defined $oldvisu) {
+	if ($savedvisu) {
 		$client->modeParam('visu', $oldvisu);
 	}
 }