[Slim-Checkins] r9292 - in /branches/6.5/server: Plugins/Visualizer.pm Slim/Player/Player.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Wed Aug 30 13:29:13 2006
New Revision: 9292

URL: http://svn.slimdevices.com?rev=9292&view=rev
Log:
Bug: N/A
Description: merge -r 9288:9289 from trunk

Modified:
    branches/6.5/server/Plugins/Visualizer.pm
    branches/6.5/server/Slim/Player/Player.pm

Modified: branches/6.5/server/Plugins/Visualizer.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Plugins/Visualizer.pm?rev=9292&r1=9291&r2=9292&view=diff
==============================================================================
--- branches/6.5/server/Plugins/Visualizer.pm (original)
+++ branches/6.5/server/Plugins/Visualizer.pm Wed Aug 30 13:29:13 2006
@@ -69,7 +69,10 @@
 
 	'SCREENSAVER.visualizer_analog_vumeter' => {
 		name => 'VISUALIZER_ANALOG_VUMETER',
-		params => [$VISUALIZER_VUMETER, 0, 1, 0, 160, 160, 160],
+		params => {
+				'transporter' => [$VISUALIZER_VUMETER, 0, 1, 0 + 320, 160, 160 + 320, 160],
+				'squeezebox2' => [$VISUALIZER_VUMETER, 0, 1, 0, 160, 160, 160],
+			},
 		showtext => 0,
 	},
 	'SCREENSAVER.visualizer_digital_vumeter' => {
@@ -311,6 +314,10 @@
 	
 	$client->modeParam('visu', $paramsRef);
 
+	# visualiser uses screen 2 - blank it and turn off other screen two displays
+	$client->update( { 'screen2' => {} } );
+	$client->modeParam('screen2', 'visualizer');
+
 	$client->lines(\&screensaverLines);
 
 	# do it again at the next period

Modified: branches/6.5/server/Slim/Player/Player.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Player.pm?rev=9292&r1=9291&r2=9292&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Player.pm (original)
+++ branches/6.5/server/Slim/Player/Player.pm Wed Aug 30 13:29:13 2006
@@ -14,6 +14,8 @@
 #
 
 use strict;
+use Scalar::Util qw(blessed);
+
 use Slim::Player::Client;
 use Slim::Utils::Misc;
 use Slim::Hardware::IR;
@@ -695,6 +697,7 @@
 
 	my $headerValue = '';
 	my $parts;
+	my $oldvisu;
 
 	if ($client->mixerConstant($feature, 'balanced')) {
 
@@ -724,10 +727,11 @@
 
 	my $featureHeader = join('', $client->string(uc($feature)), $headerValue);
 
-	# XXXX hack attack: turn off visualizer when showing volume, etc.
-	my $oldvisu = $client->modeParam('visu');
-
-	$client->modeParam('visu', [0]);
+	if (blessed($client->display) eq 'Slim::Display::Squeezebox2') {
+		# XXXX hack attack: turn off visualizer when showing volume, etc.		
+		$oldvisu = $client->modeParam('visu');
+		$client->modeParam('visu', [0]);
+	}
 
 	$parts ||= Slim::Buttons::Input::Bar::lines($client, $featureValue, $featureHeader, {
 		'min'       => $client->mixerConstant($feature, 'min'),
@@ -739,7 +743,9 @@
 	$client->display->showBriefly($parts, { 'name' => 'mixer' } );
 
 	# Turn the visualizer back to it's old value.
-	$client->modeParam('visu', $oldvisu);	
+	if (defined $oldvisu) {
+		$client->modeParam('visu', $oldvisu);
+	}
 }
 
 1;