[Slim-Checkins] r12748 - in /trunk/server: HTML/EN/html/docs/cli-api.html Slim/Control/Queries.pm Slim/Control/Request.pm
bklaas at svn.slimdevices.com
bklaas at svn.slimdevices.com
Mon Aug 27 19:57:55 PDT 2007
Author: bklaas
Date: Mon Aug 27 19:57:55 2007
New Revision: 12748
URL: http://svn.slimdevices.com?rev=12748&view=rev
Log:
allow for alternative order for player commands, putting id/index as first argument
Modified:
trunk/server/HTML/EN/html/docs/cli-api.html
trunk/server/Slim/Control/Queries.pm
trunk/server/Slim/Control/Request.pm
Modified: trunk/server/HTML/EN/html/docs/cli-api.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/docs/cli-api.html?rev=12748&r1=12747&r2=12748&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/docs/cli-api.html (original)
+++ trunk/server/HTML/EN/html/docs/cli-api.html Mon Aug 27 19:57:55 2007
@@ -85,6 +85,9 @@
</li>
<li>
New notification mechanism for preference changes: "<a href="#prefset">prefset</a>".
+ </li>
+ <li>
+ "<a href="#PC">Player commands</a>" allow for alternate syntax, putting the mac address/player index as the first argument (needed for jive support).
</li>
</ul>
<p>
@@ -1084,6 +1087,15 @@
?
</code>
</strong>
+ <br>or, alternatively<br>
+ <strong>
+ <code>
+ <playerindex>
+ player
+ id
+ ?
+ </code>
+ </strong>
</p>
<p>
The "player id ?" query returns the unique identifier of a player,
@@ -1096,7 +1108,7 @@
</p>
<blockquote>
<p>
- Request: "player id 0 ?<LF>"
+ Request: "player id 0 ?<LF>" (or) "0 player id ?"
<br>
Response: "player id 0 04:20:00:12:23:45<LF>"
</p>
@@ -1112,6 +1124,16 @@
?
</code>
</strong>
+ <br>or, alternatively<br>
+ <strong>
+ <code>
+ <playerindex|playerid>
+ player
+ name
+ ?
+ </code>
+ </strong>
+
</p>
<p>
The "player name ?" query returns the human-readable name for the
@@ -1123,7 +1145,7 @@
</p>
<blockquote>
<p>
- Request: "player name 0 ?<LF>"
+ Request: "player name 0 ?<LF>" or "0 player name ?"
<br>
Response: "player name 0 Living Room<LF>"
</p>
@@ -1139,6 +1161,15 @@
?
</code>
</strong>
+ <br>or, alternatively<br>
+ <strong>
+ <code>
+ <playerindex|playerid>
+ player
+ ip
+ ?
+ </code>
+ </strong>
</p>
<p>
The "player ip ?" query returns the IP address (along with port
@@ -1149,7 +1180,7 @@
</p>
<blockquote>
<p>
- Request: "player ip 0 ?<LF>"
+ Request: "player ip 0 ?<LF>" or "0 player ip ?"
<br>
Response: "player ip 0 192.168.1.22:3483<LF>"
</p>
@@ -1165,6 +1196,15 @@
?
</code>
</strong>
+ <br>or, alternatively<br>
+ <strong>
+ <code>
+ <playerindex|playerid>
+ player
+ model
+ ?
+ </code>
+ </strong>
</p>
<p>
The "player model ?" query returns the model of the player,
@@ -1177,7 +1217,7 @@
</p>
<blockquote>
<p>
- Request: "player model 0 ?<LF>"
+ Request: "player model 0 ?<LF>" or "0 player model ?"
<br>
Response: "player model squeezebox<LF>"
</p>
@@ -1193,6 +1233,15 @@
?
</code>
</strong>
+ <br>or, alternatively<br>
+ <strong>
+ <code>
+ <playerindex|playerid>
+ player
+ displaytype
+ ?
+ </code>
+ </strong>
</p>
<p>
The "player displaytype ?" query returns the display model of the
@@ -1204,7 +1253,7 @@
</p>
<blockquote>
<p>
- Request: "player displaytype 0 ?<LF>"
+ Request: "player displaytype 0 ?<LF>" or "0 player displaytype ?"
<br>
Response: "player displaytype 0 noritake-katakana<LF>"
</p>
Modified: trunk/server/Slim/Control/Queries.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Control/Queries.pm?rev=12748&r1=12747&r2=12748&view=diff
==============================================================================
--- trunk/server/Slim/Control/Queries.pm (original)
+++ trunk/server/Slim/Control/Queries.pm Mon Aug 27 19:57:55 2007
@@ -1363,6 +1363,8 @@
# get our parameters
my $entity = $request->getRequest(1);
+ # if element 1 is 'player', that means next element is the entity
+ $entity = $request->getResults(2) if $entity eq 'player';
my $clientparam = $request->getParam('_IDorIndex');
if ($entity eq 'count') {
Modified: trunk/server/Slim/Control/Request.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Control/Request.pm?rev=12748&r1=12747&r2=12748&view=diff
==============================================================================
--- trunk/server/Slim/Control/Request.pm (original)
+++ trunk/server/Slim/Control/Request.pm Mon Aug 27 19:57:55 2007
@@ -100,6 +100,12 @@
N player model <index or ID> ?
N player displaytype <index or ID> ?
N players <startindex> <numitems> <tagged parameters>
+ N <index or ID> player ip ?
+ N <index or ID> player id|address ?
+ N <index or ID> player name ?
+ N <index or ID> player model ?
+ N <index or ID> player displaytype ?
+ N <index or ID> player name ?
=head2 PLAYLISTS
@@ -500,6 +506,13 @@
addDispatch(['player', 'ip', '_IDorIndex', '?'], [0, 1, 0, \&Slim::Control::Queries::playerXQuery]);
addDispatch(['player', 'model', '_IDorIndex', '?'], [0, 1, 0, \&Slim::Control::Queries::playerXQuery]);
addDispatch(['player', 'name', '_IDorIndex', '?'], [0, 1, 0, \&Slim::Control::Queries::playerXQuery]);
+ addDispatch(['_IDorIndex', 'player', 'address', '?'], [0, 1, 0, \&Slim::Control::Queries::playerXQuery]);
+ addDispatch(['_IDorIndex', 'player', 'displaytype','?'], [0, 1, 0, \&Slim::Control::Queries::playerXQuery]);
+ addDispatch(['_IDorIndex', 'player', 'id', '?'], [0, 1, 0, \&Slim::Control::Queries::playerXQuery]);
+ addDispatch(['_IDorIndex', 'player', 'ip', '?'], [0, 1, 0, \&Slim::Control::Queries::playerXQuery]);
+ addDispatch(['_IDorIndex', 'player', 'model', '?'], [0, 1, 0, \&Slim::Control::Queries::playerXQuery]);
+ addDispatch(['_IDorIndex', 'player', 'name', '?'], [0, 1, 0, \&Slim::Control::Queries::playerXQuery]);
+ addDispatch(['_IDorIndex', 'player', 'name', '?'], [0, 1, 0, \&Slim::Control::Queries::playerXQuery]);
addDispatch(['playerpref', '_prefname', '?'], [1, 1, 0, \&Slim::Control::Queries::playerprefQuery]);
addDispatch(['playerpref', 'validate', '_prefname', '_newvalue'], [1, 1, 0, \&Slim::Control::Queries::prefValidateQuery]);
addDispatch(['playerpref', '_prefname', '_newvalue'], [1, 0, 0, \&Slim::Control::Commands::playerprefCommand]);
More information about the checkins
mailing list