Author: bklaas
Date: Thu Feb 28 07:56:57 2008
New Revision: 2072
URL: http://svn.slimdevices.com?rev=2072&root=Jive&view=rev
Log:
Bug: 7132
Description: manual merge of 7.0 change into trunk
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua?rev=2072&root=Jive&r1=2071&r2=2072&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
(original)
+++
trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
Thu Feb 28 07:56:57 2008
@@ -1202,19 +1202,24 @@
self.slimserver = slimserver:getName()
if slimserver:isSqueezeNetwork() then
+ local sn_hostname = jnt:getSNHostname()
+
+ if sn_hostname == "www.squeezenetwork.com" then
+ self.data2.server_address = Udap.packNumber(1, 4)
+ elseif sn_hostname == "www.beta.squeezenetwork.com" then
+ self.data2.server_address = Udap.packNumber(1, 4)
+ -- XXX the above should be this when "serv 2" in all
firmware:
+ -- self.data2.server_address = Udap.packNumber(2, 4)
+ else
+ -- for locally edited values (SN developers)
+ local ip = socket.dns.toip(sn_hostname)
+ self.data2.server_address =
Udap.packNumber(parseip(ip), 4)
+ end
+
+ log:info("SN server_address=", self.data2.server_address)
+
-- set slimserver address to 0.0.0.1 to workaround a bug in
-- squeezebox firmware
- --
- -- XXX this should be this when in production or post "serv 2"
firmware:
- -- self.data2.server_address = Udap.packNumber(1, 4)
- -- self.data2.slimserver_address =
Udap.packNumber(parseip("0.0.0.1"), 4)
- -- or:
- -- self.data2.server_address = Udap.packNumber(2, 4)
- -- self.data2.slimserver_address =
Udap.packNumber(parseip("0.0.0.1"), 4)
- --
- local ip = socket.dns.toip(jnt:getSNHostname())
- log:info("SN server_address=", ip)
- self.data2.server_address = Udap.packNumber(parseip(ip), 4)
self.data2.slimserver_address =
Udap.packNumber(parseip("0.0.0.1"), 4)
else
log:info("SC slimserver_address=", serverip)
Modified: trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua?rev=2072&root=Jive&r1=2071&r2=2072&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
(original)
+++ trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua Thu Feb
28 07:56:57 2008
@@ -290,7 +290,7 @@
=cut
--]]
function getSNHostname(self)
- return "www.beta.squeezenetwork.com"
+ return "www.squeezenetwork.com"
end
--[[
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
