[Slim-Checkins] r9763 - in /trunk/server/Slim: Buttons/Input/Choice.pm Buttons/Input/List.pm Buttons/Playlist.pm Player/Transporter.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Fri Sep 15 15:19:36 2006
New Revision: 9763

URL: http://svn.slimdevices.com?rev=9763&view=rev
Log:
Bug: 4119 (part)
Description:
- update knob with current position when remote is used.
- change updateKnob param name to be clearer

Modified:
    trunk/server/Slim/Buttons/Input/Choice.pm
    trunk/server/Slim/Buttons/Input/List.pm
    trunk/server/Slim/Buttons/Playlist.pm
    trunk/server/Slim/Player/Transporter.pm

Modified: trunk/server/Slim/Buttons/Input/Choice.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Input/Choice.pm?rev=9763&r1=9762&r2=9763&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Input/Choice.pm (original)
+++ trunk/server/Slim/Buttons/Input/Choice.pm Fri Sep 15 15:19:36 2006
@@ -322,6 +322,8 @@
 
 	$$valueRef = $listRef->[$newposition];
 	$client->param('listIndex',$newposition);
+
+	$client->updateKnob();
 
 	my $onChange = getParam($client,'onChange');
 

Modified: trunk/server/Slim/Buttons/Input/List.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Input/List.pm?rev=9763&r1=9762&r2=9763&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Input/List.pm (original)
+++ trunk/server/Slim/Buttons/Input/List.pm Fri Sep 15 15:19:36 2006
@@ -175,6 +175,8 @@
 	$client->param('listIndex', $newposition);
 
 	my $onChange = $client->param('onChange');
+
+	$client->updateKnob();
 
 	if (ref($onChange) eq 'CODE') {
 		my $onChangeArgs = $client->param('onChangeArgs');

Modified: trunk/server/Slim/Buttons/Playlist.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Playlist.pm?rev=9763&r1=9762&r2=9763&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Playlist.pm (original)
+++ trunk/server/Slim/Buttons/Playlist.pm Fri Sep 15 15:19:36 2006
@@ -148,6 +148,7 @@
 
 					browseplaylistindex($client, $newposition);
 					$client->pushUp();
+					$client->updateKnob();
 				}
 			}
 		},
@@ -176,6 +177,7 @@
 				if ($newposition != browseplaylistindex($client)) {
 					browseplaylistindex($client,$newposition);
 					$client->pushDown();
+					$client->updateKnob();
 				}
 			}
 		},

Modified: trunk/server/Slim/Player/Transporter.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Transporter.pm?rev=9763&r1=9762&r2=9763&view=diff
==============================================================================
--- trunk/server/Slim/Player/Transporter.pm (original)
+++ trunk/server/Slim/Player/Transporter.pm Fri Sep 15 15:19:36 2006
@@ -146,8 +146,8 @@
 }
 
 sub updateKnob {
-	my $client    = shift;
-	my $forceSend = shift || 0;
+	my $client  = shift;
+	my $newList = shift || 0;
 
 	my $listIndex = $client->param('listIndex');
 	my $listLen   = $client->param('listLen');
@@ -168,11 +168,12 @@
 	my $height   = $client->param('knobHeight') || 0;
 	my $backForce = $client->param('knobBackgroundForce') || 0;
 
-	if (defined $listIndex && (($listIndex == $knobPos) || $forceSend)) {
+	if (defined $listIndex && (($listIndex != $knobPos) || $newList)) {
 
 		my $parambytes;
 
-		if (defined $listLen) {
+		if ($newList) {
+
 			$client->knobSync( (++$knobSync) & 0xFF);
 
 			$parambytes = pack "NNCcncc", $listIndex, $listLen, $knobSync, $flags, $width, $height, $backForce;