[Slim-Checkins] r10009 - in /branches/6.5/server: Changelog6.html Slim/Buttons/Block.pm Slim/Networking/Slimproto.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Sat Sep 23 06:28:01 2006
New Revision: 10009

URL: http://svn.slimdevices.com?rev=10009&view=rev
Log:
Bug: 4159
Description: merge from trunk -r 9922:9923

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Buttons/Block.pm
    branches/6.5/server/Slim/Networking/Slimproto.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10009&r1=10008&r2=10009&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Sat Sep 23 06:28:01 2006
@@ -7,6 +7,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4142">#4142</a> - ExBrowse3 does not work with Safari</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4145">#4145</a> - Display station name instead of album name in overlay text visualizers on transporter second screen</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4156">#4156</a> - slimtray should install the service if it's not already installed when starting</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4159">#4159</a> - second screen needs to be blank when prompting for software update on transporter</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4168">#4168</a> - Live365 plugin fails in 6.5.0</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4171">#4171</a> - Default2 redirect to Default.</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4173">#4173</a> - press right to add to favorites option disappears once you've used it, until you restart server</li>

Modified: branches/6.5/server/Slim/Buttons/Block.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Block.pm?rev=10009&r1=10008&r2=10009&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Block.pm (original)
+++ branches/6.5/server/Slim/Buttons/Block.pm Sat Sep 23 06:28:01 2006
@@ -60,6 +60,8 @@
 sub setMode {
 	my $client = shift;
 
+	$client->modeParam('screen2', 'inherit');
+
 	# store current lines function so it can be replaced when block mode is popped
 	# this is required as popping block mode does not call the setMode of the previous mode
 	$client->modeParam('oldLines', $client->lines );
@@ -104,12 +106,9 @@
 
 	$client->blocklines( { 'static' => $static, 'parts' => $parts, 'ticks' => 0 } );
 
-	my $screen2mode = $client->param('screen2');
-
 	Slim::Buttons::Common::pushMode($client, 'block');
 
 	$client->modeParam('block.name', $blockName);
-	$client->modeParam('screen2', $screen2mode);
 
 	if (ref($parts) eq 'HASH') {
 

Modified: branches/6.5/server/Slim/Networking/Slimproto.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Networking/Slimproto.pm?rev=10009&r1=10008&r2=10009&view=diff
==============================================================================
--- branches/6.5/server/Slim/Networking/Slimproto.pm (original)
+++ branches/6.5/server/Slim/Networking/Slimproto.pm Sat Sep 23 06:28:01 2006
@@ -878,14 +878,21 @@
 		$client->sendFrame('ureq');
 
 		$client->brightness($client->maxBrightness());
+
+		# turn of visualizers and screen2 display
+		$client->modeParam('visu', [0]);
+		$client->modeParam('screen2active', undef);
 		
 		$client->block( {
-			'line' => [ string('PLAYER_NEEDS_UPGRADE_1'), string('PLAYER_NEEDS_UPGRADE_2') ],
-			'fonts' => { 
-				'graphic-320x32' => 'light',
-				'graphic-280x16' => 'small',
-				'text'           => 2,
-			}
+			'screen1' => {
+				'line' => [ string('PLAYER_NEEDS_UPGRADE_1'), string('PLAYER_NEEDS_UPGRADE_2') ],
+				'fonts' => { 
+					'graphic-320x32' => 'light',
+					'graphic-280x16' => 'small',
+					'text'           => 2,
+				}
+			},
+			'screen2' => {},
 		}, 'upgrade');
 
 	} else {