[Slim-Checkins] r9758 - in /branches/6.5/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 13:23:10 2006
New Revision: 9758

URL: http://svn.slimdevices.com?rev=9758&view=rev
Log:
Bug: 3572
Description: merge from trunk -r 9756:9757

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

Modified: branches/6.5/server/Slim/Buttons/Input/Choice.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Input/Choice.pm?rev=9758&r1=9757&r2=9758&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Input/Choice.pm (original)
+++ branches/6.5/server/Slim/Buttons/Input/Choice.pm Fri Sep 15 13:23:10 2006
@@ -187,7 +187,7 @@
 
 		my ($newPos, $dir, $pushDir, $wrap) = $client->knobListPos();
 		
-		changePos($client, $dir, $funct, $pushDir);
+		changePos($client, $dir, $funct, $pushDir) if $pushDir;
 	},
 	'numberScroll' => sub {
 		my ($client, $funct, $functarg) = @_;

Modified: branches/6.5/server/Slim/Buttons/Input/List.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Input/List.pm?rev=9758&r1=9757&r2=9758&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Input/List.pm (original)
+++ branches/6.5/server/Slim/Buttons/Input/List.pm Fri Sep 15 13:23:10 2006
@@ -73,7 +73,7 @@
 
 		my ($newPos, $dir, $pushDir, $wrap) = $client->knobListPos();
 		
-		changePos($client, $dir, $funct, $pushDir);
+		changePos($client, $dir, $funct, $pushDir) if $pushDir;
 	},
 
 	'numberScroll' => sub {

Modified: branches/6.5/server/Slim/Buttons/Playlist.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Playlist.pm?rev=9758&r1=9757&r2=9758&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Playlist.pm (original)
+++ branches/6.5/server/Slim/Buttons/Playlist.pm Fri Sep 15 13:23:10 2006
@@ -113,7 +113,11 @@
 
 				if ($songcount < 2) {
 					
-					$pushDir eq 'up' ? $client->bumpUp : $client->bumpDown;
+					if ($pushDir) {
+
+						$pushDir eq 'up' ? $client->bumpUp : $client->bumpDown;
+
+					}
 
 				} else {
 

Modified: branches/6.5/server/Slim/Player/Transporter.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Transporter.pm?rev=9758&r1=9757&r2=9758&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Transporter.pm (original)
+++ branches/6.5/server/Slim/Player/Transporter.pm Fri Sep 15 13:23:10 2006
@@ -180,7 +180,13 @@
 	if ($listLen == 1) {
 
 		# knob return negative value anti-clockwise and +1 for clockwise
-		$direction = $newPos > 0 ? 'up' : 'down';
+		# set direction only if a bump is required otherwise leave as undef
+		if ($newPos > 0) {
+			$direction = 'up';
+		} elsif($newPos < 0) {
+			$direction = 'down';
+		}
+
 		$newPos = $curPos;
 
 	} elsif ($listLen == 2) {