[Slim-Checkins] r9883 - in /branches/6.5/server: Changelog6.html
Slim/Buttons/Input/Bar.pm
Slim/Buttons/Input/Choice.pm Slim/Buttons/Input/List.pm
Slim/Buttons/Input/Text.pm Slim/Buttons/Input/Time.pm
Slim/Buttons/Playlist.pm Slim/Player/Transporter.pm
adrian at svn.slimdevices.com
adrian at svn.slimdevices.com
Tue Sep 19 11:59:08 PDT 2006
Author: adrian
Date: Tue Sep 19 11:59:00 2006
New Revision: 9883
URL: http://svn.slimdevices.com?rev=9883&view=rev
Log:
Bug: 4119
Description: merge from trunk changes 9763, 9784, 9788, 9882
Modified:
branches/6.5/server/Changelog6.html
branches/6.5/server/Slim/Buttons/Input/Bar.pm
branches/6.5/server/Slim/Buttons/Input/Choice.pm
branches/6.5/server/Slim/Buttons/Input/List.pm
branches/6.5/server/Slim/Buttons/Input/Text.pm
branches/6.5/server/Slim/Buttons/Input/Time.pm
branches/6.5/server/Slim/Buttons/Playlist.pm
branches/6.5/server/Slim/Player/Transporter.pm
Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=9883&r1=9882&r2=9883&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Tue Sep 19 11:59:00 2006
@@ -619,6 +619,7 @@
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4095">#4095</a> - Volume sometimes found set to n.5 after upgrade</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4108">#4108</a> - Digital Input plugin should only appear on Transporters</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4109">#4109</a> - Alarm playlist selection does not appear to stick</li>
+ <li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4119">#4119</a> - Using the remote does not update the knob position</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4127">#4127</a> - need to handle cr only line endings in pls parser</li>
</ul>
</ul>
Modified: branches/6.5/server/Slim/Buttons/Input/Bar.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Input/Bar.pm?rev=9883&r1=9882&r2=9883&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Input/Bar.pm (original)
+++ branches/6.5/server/Slim/Buttons/Input/Bar.pm Tue Sep 19 11:59:00 2006
@@ -333,6 +333,8 @@
my $onChange = $client->param('onChange');
+ $client->updateKnob();
+
if (ref($onChange) eq 'CODE') {
my $onChangeArgs = $client->param('onChangeArgs');
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=9883&r1=9882&r2=9883&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Input/Choice.pm (original)
+++ branches/6.5/server/Slim/Buttons/Input/Choice.pm Tue Sep 19 11:59:00 2006
@@ -322,6 +322,8 @@
$$valueRef = $listRef->[$newposition];
$client->param('listIndex',$newposition);
+
+ $client->updateKnob();
my $onChange = getParam($client,'onChange');
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=9883&r1=9882&r2=9883&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Input/List.pm (original)
+++ branches/6.5/server/Slim/Buttons/Input/List.pm Tue Sep 19 11:59:00 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: branches/6.5/server/Slim/Buttons/Input/Text.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Input/Text.pm?rev=9883&r1=9882&r2=9883&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Input/Text.pm (original)
+++ branches/6.5/server/Slim/Buttons/Input/Text.pm Tue Sep 19 11:59:00 2006
@@ -593,6 +593,7 @@
$client->param('listIndex',$charIndex);
$client->update();
+ $client->updateKnob();
}
#find the position of the character in the character array
Modified: branches/6.5/server/Slim/Buttons/Input/Time.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Input/Time.pm?rev=9883&r1=9882&r2=9883&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Input/Time.pm (original)
+++ branches/6.5/server/Slim/Buttons/Input/Time.pm Tue Sep 19 11:59:00 2006
@@ -487,6 +487,10 @@
$onChange->(@args);
}
+ my @timedigits = timeDigits($client, $client->modeParam('valueRef'));
+ $client->modeParam('listIndex', $timedigits[$client->modeParam('cursorPos')]);
+ $client->updateKnob();
+
$client->update();
}
Modified: branches/6.5/server/Slim/Buttons/Playlist.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Playlist.pm?rev=9883&r1=9882&r2=9883&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Playlist.pm (original)
+++ branches/6.5/server/Slim/Buttons/Playlist.pm Tue Sep 19 11:59:00 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: branches/6.5/server/Slim/Player/Transporter.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Transporter.pm?rev=9883&r1=9882&r2=9883&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Transporter.pm (original)
+++ branches/6.5/server/Slim/Player/Transporter.pm Tue Sep 19 11:59:00 2006
@@ -145,8 +145,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');
@@ -167,11 +167,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;
@@ -188,6 +189,8 @@
}
$client->sendFrame('knob', \$parambytes);
+
+ $client->knobPos($listIndex);
} else {
More information about the checkins
mailing list