[Slim-Checkins] r33761 - in /7.7/trunk/server: Changelog7.html Slim/Control/Commands.pm Slim/Control/Request.pm

Author: ayoung
Date: Thu Dec 22 06:25:36 2011
New Revision: 33761

URL: http://svn.slimdevices.com/slim?rev=33761&view=rev
Log:
Fixed bug 17835: playlistcontrol cmd:load ... play_index:yyyy doesn't work with folders 
Make sure that play_index parameter is passed from playlistcontrol to "playlist load" and that it is acted upon.

Modified:
    7.7/trunk/server/Changelog7.html
    7.7/trunk/server/Slim/Control/Commands.pm
    7.7/trunk/server/Slim/Control/Request.pm

Modified: 7.7/trunk/server/Changelog7.html
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Changelog7.html?rev=33761&r1=33760&r2=33761&view=diff
==============================================================================
--- 7.7/trunk/server/Changelog7.html (original)
+++ 7.7/trunk/server/Changelog7.html Thu Dec 22 06:25:36 2011
@@ -1,4 +1,13 @@
-<h2><a name="v7.7.1" id="v7.7.1"></a>Version 7.7.1</h2>
+<h2><a name="v7.7.2" id="v7.7.2"></a>Version 7.7.2</h2>
+<ul>
+	<li>Bug Fixes:</li>
+	<ul>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17835">#17835</a> - playlistcontrol cmd:load ... play_index:yyyy doesn't work with folders</li>
+	</ul>
+	<br />
+</ul>
+
+<h2><a name="v7.7.1" id="v7.7.1"></a>Version 7.7.1 - 2011-12-14</h2>
 <ul>
 	<li>New Features:</li>
 	<ul>

Modified: 7.7/trunk/server/Slim/Control/Commands.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Control/Commands.pm?rev=33761&r1=33760&r2=33761&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Control/Commands.pm (original)
+++ 7.7/trunk/server/Slim/Control/Commands.pm Thu Dec 22 06:25:36 2011
@@ -1445,7 +1445,7 @@
 
 	if ($cmd =~ /^(play|load)$/) { 
 
-		$jumpToIndex = 0;
+		$jumpToIndex = 0 if !defined $jumpToIndex;
 
 	} elsif ($cmd eq "resume" && Slim::Music::Info::isM3U($path)) {
 

Modified: 7.7/trunk/server/Slim/Control/Request.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Control/Request.pm?rev=33761&r1=33760&r2=33761&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Control/Request.pm (original)
+++ 7.7/trunk/server/Slim/Control/Request.pm Thu Dec 22 06:25:36 2011
@@ -567,7 +567,7 @@
 	addDispatch(['playlist',       'inserttracks',   '_what',      '_listref'],                        [1, 0, 0, \&Slim::Control::Commands::playlistXtracksCommand]);
 	addDispatch(['playlist',       'jump',           '?'],                                             [1, 1, 0, \&Slim::Control::Queries::playlistXQuery]);
 	addDispatch(['playlist',       'jump',           '_index',     '_fadein', '_noplay', '_seekdata'], [1, 0, 0, \&Slim::Control::Commands::playlistJumpCommand]);
-	addDispatch(['playlist',       'load',           '_item'],                                         [1, 0, 0, \&Slim::Control::Commands::playlistXitemCommand]);
+	addDispatch(['playlist',       'load',           '_item'],                                         [1, 0, 1, \&Slim::Control::Commands::playlistXitemCommand]);
 	addDispatch(['playlist',       'loadalbum',      '_genre',     '_artist',     '_album', '_title'], [1, 0, 0, \&Slim::Control::Commands::playlistXalbumCommand]);
 	addDispatch(['playlist',       'loadtracks',     '_what',      '_listref',    '_fadein', '_index'],[1, 0, 0, \&Slim::Control::Commands::playlistXtracksCommand]);
 	addDispatch(['playlist',       'modified',       '?'],                                             [1, 1, 0, \&Slim::Control::Queries::playlistXQuery]);