[Slim-Checkins] r9674 - in /branches/6.5/server/Plugins: Health/NetTest.pm Rescan.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Wed Sep 13 15:32:34 2006
New Revision: 9674

URL: http://svn.slimdevices.com?rev=9674&view=rev
Log:
Bug: N/A
Description: merge from trunk 9659:9661

Modified:
    branches/6.5/server/Plugins/Health/NetTest.pm
    branches/6.5/server/Plugins/Rescan.pm

Modified: branches/6.5/server/Plugins/Health/NetTest.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Plugins/Health/NetTest.pm?rev=9674&r1=9673&r2=9674&view=diff
==============================================================================
--- branches/6.5/server/Plugins/Health/NetTest.pm (original)
+++ branches/6.5/server/Plugins/Health/NetTest.pm Wed Sep 13 15:32:34 2006
@@ -46,6 +46,18 @@
 		Slim::Utils::Timers::killTimers($client, \&updateDisplay);
 		updateDisplay($client, $params);
 	},
+
+	'knob' => sub {
+		my ($client, $funct, $functarg) = @_;
+
+		my $test = $client->knobPos;
+
+		my $params = $client->modeParam('Health.NetTest') || return;
+		setTest($client, $test, undef, $params);
+		Slim::Utils::Timers::killTimers($client, \&updateDisplay);
+		updateDisplay($client, $params);
+	},
+
 );
 
 sub setMode {
@@ -55,6 +67,12 @@
 		$client->lines(\&errorLines);
 		return;
 	} 
+
+	if ($client->isa('Slim::Player::Transporter')) {
+		$client->param('listLen', scalar(@testRates));
+		$client->param('listIndex', 0);
+		$client->updateKnob(1);
+	}
 
 	$client->execute(["stop"]); # ensure this player is not streaming
 

Modified: branches/6.5/server/Plugins/Rescan.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Plugins/Rescan.pm?rev=9674&r1=9673&r2=9674&view=diff
==============================================================================
--- branches/6.5/server/Plugins/Rescan.pm (original)
+++ branches/6.5/server/Plugins/Rescan.pm Wed Sep 13 15:32:34 2006
@@ -50,6 +50,17 @@
 			if ($newposition != $menuSelection{$client}) {
 				$menuSelection{$client} =$newposition;
 				$client->pushDown();
+			}
+		},
+
+		'knob' => sub  {
+			my $client = shift;
+			my ($newPos, $dir, $pushDir, $wrap) = $client->knobListPos($menuSelection{$client}, $#browseMenuChoices);
+			my $newposition = Slim::Buttons::Common::scroll($client, $dir, ($#browseMenuChoices + 1), $menuSelection{$client});
+
+			if ($newposition != $menuSelection{$client}) {
+				$menuSelection{$client} =$newposition;
+				$pushDir eq 'up' ? $client->pushUp : $client->pushDown;
 			}
 		},
 
@@ -145,8 +156,11 @@
 		$client->string('PLUGIN_RESCAN_PRESS_PLAY'),
 	);
 
+	$client->param('listLen', scalar(@browseMenuChoices));
+
 	unless (defined($menuSelection{$client})) {
 		$menuSelection{$client} = 0;
+		$client->param('listIndex', 0);
 	}
 
 	$client->lines(\&lines);