Author: bklaas
Date: Thu Sep 4 14:03:06 2008
New Revision: 2907
URL: http://svn.slimdevices.com?rev=2907&root=Jive&view=rev
Log:
Bug: 9307
Description: allow other music sources to be selected from boom
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=2907&root=Jive&r1=2906&r2=2907&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Thu Sep 4 14:03:06 2008
@@ -126,8 +126,7 @@
function _addServerItem(self, server, address)
log:debug("_addServerItem ", server, " " , port)
- local id = server or address
-
+ local id = server:getIpPort() or address
-- remove existing entry
if self.serverList[id] then
@@ -165,8 +164,6 @@
if currentPlayer and currentPlayer:getSlimServer() and server ==
currentPlayer:getSlimServer() then
item.style = 'checkedNoAction'
item.callback = nil
- elseif not currentPlayer or not currentPlayer:canConnectToServer() then
- return
end
self.serverMenu:addItem(item)
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2907&root=Jive&r1=2906&r2=2907&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Thu Sep 4
14:03:06 2008
@@ -81,7 +81,7 @@
[4] = "squeezebox2",
[5] = "transporter",
[7] = "receiver",
- [10] = "b",
+ [10] = "boom",
}
@@ -655,7 +655,7 @@
if self.info.model == "squeezebox2"
or self.info.model == "receiver"
or self.info.model == "transporter"
- or self.info.model == "b" then
+ or self.info.model == "boom" then
return string.gsub(self.id, "[^%x]", "")
end
@@ -1156,7 +1156,7 @@
return self.info.model == "squeezebox2"
or self.info.model == "receiver"
or self.info.model == "transporter"
- or self.info.model == "b"
+ or self.info.model == "boom"
end
@@ -1165,7 +1165,7 @@
return self.info.model == "squeezebox2"
or self.info.model == "receiver"
or self.info.model == "transporter"
- or self.info.model == "b"
+ or self.info.model == "boom"
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
