Changeset 139

Timestamp:

2013-12-30 14:07:28 (11 years ago)

Author:

lolodomo

Message:

New: playback of a Sirius station with the following URI format in PlayURI command: SR:<stationID>

Location:

trunk

Files:

• I_Sonos1.xml (modified) (5 diffs)
• J_Sonos1.js (modified) (2 diffs)

trunk/I_Sonos1.xml ¶

@@ -336 +336 @@
           for item2 in item:gmatch("(<"..subtag.."%s.-/>)") do
               zoneName = item2:match("<"..subtag..'%s?.-%sZoneName="([^"]+)".-/>')
+-- TODO fix for pairs
               if (zoneName == name) then
                   result = item2:match("<"..subtag..'%s?.-%sUUID="([^"]+)".-/>')
@@ -462 +463 @@
             serviceCmd, serviceId = transportUri:match("x%-sonosapi%-radio:([^%?]+%?sid=(%d+).*)")
         end
+        if (serviceCmd == nil) then
+            serviceCmd, serviceId = transportUri:match("x%-sonosapi%-hls:([^%?]+%?sid=(%d+).*)")
+        end
         if (serviceCmd == nil and trackUri ~= nil) then
             serviceCmd, serviceId = trackUri:match("x%-sonosprog%-http:([^%?]+%?sid=(%d+).*)")
@@ -598 +602 @@
           for item2 in item:gmatch("(<"..subtag.."%s.-/>)") do
               id = item2:match("<"..subtag..'%s?.-%sUUID="([^"]+)".-/>')
+-- TODO fix for pairs
               if (id ~= nil) then
                   if (members ~= "") then
@@ -1027 +1032 @@
         uri = getValueFromXML(dataTable[localUUID].FavoritesRadios, "item", "dc:title", station, "res")
     elseif (uri:sub(1, 3) == "TR:") then
-        serviceId = getSonosServiceId("TuneIn")
+        serviceId = getSonosServiceId("TuneIn") or "254"
         uri = "x-sonosapi-stream:s" .. uri:sub(4) .. "?sid=" .. serviceId .. "&flags=32"
         station = "xxx"
+    elseif (uri:sub(1, 3) == "SR:") then
+        station = uri:sub(4)
+        serviceId = getSonosServiceId("Sirius") or "37"
+        uri = "x-sonosapi-hls:r%3a" .. station .. "?sid=" .. serviceId .. "&flags=288"
+log("Sirius URI: " .. uri)
     elseif (uri:sub(1, 3) == "GZ:") then
         controlByGroup = false
@@ -1050 +1060 @@
                               .. '</item></DIDL-Lite>'
             else
+log("Service name for serviceId: " .. serviceId .. ": " .. service)
                 uriMetaData = '<DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/">'
                               .. '<item><dc:title>' .. station .. '</dc:title>'

trunk/J_Sonos1.js ¶

@@ -172 +172 @@
     html += '<option value="FR">Favorite radio</option>';
     html += '<option value="TR">TuneIn radio</option>';
+    html += '<option value="SR">Sirius radio</option>';
     html += '<option value="GZ">Group zone</option>';
     html += '</select>';
@@ -314 +315 @@
     html += '<td>x-sonosapi-stream:s50486?sid=254&flags=32 **</td>';
     html += '<td>TR:50486</td>';
+    html += '</tr>';
+
+    html += '<tr>';
+    html += '<td>Sirius radio with sid shade45</td>';
+    html += '<td>x-sonosapi-hls:r%3ashade45?sid=37&flags=288 **</td>';
+    html += '<td>SR:shade45</td>';
     html += '</tr>';