Author: titmuss
Date: Mon Jun 16 15:04:25 2008
New Revision: 2574
URL: http://svn.slimdevices.com?rev=2574&root=Jive&view=rev
Log:
Bug: 2569
Description:
Enable SN.
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua?rev=2574&root=Jive&r1=2573&r2=2574&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua
Mon Jun 16 15:04:25 2008
@@ -56,9 +56,7 @@
-- constants
local PORT = 3483 -- port used to discover SqueezeCenters
local DISCOVERY_TIMEOUT = 120000 -- timeout (in milliseconds) before removing
SqueezeCenters and Players
-
--- XXXX 60000
-local DISCOVERY_PERIOD = 10000 -- discovery period
+local DISCOVERY_PERIOD = 60000 -- discovery period
@@ -260,8 +258,8 @@
-- Special case Squeezenetwork
if jnt:getUUID() then
----- XXXX
----- SlimServer(jnt, jnt:getSNHostname(), 9000, "SqueezeNetwork")
+ squeezenetwork = SlimServer(jnt, "SqueezeNetwork")
+ squeezenetwork:updateAddress(jnt:getSNHostname(), 9000)
end
-- Remove SqueezeCenters that have not been seen for a while
@@ -342,7 +340,7 @@
end
log:info("Players:")
for i, player in Player.iterate() do
- log:info("\t", player:getName(), " [", player:getId(), "]
server=", player:getSlimServer(), " connected=", player:isConnected(), "
timeout=", DISCOVERY_TIMEOUT - (now - player:getLastSeen()))
+ log:info("\t", player:getName(), " [", player:getId(), "]
server=", player:getSlimServer(), " connected=", player:isConnected(), "
available=", player:isAvailable(), " timeout=", DISCOVERY_TIMEOUT - (now -
player:getLastSeen()))
end
log:info("----")
end
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2574&root=Jive&r1=2573&r2=2574&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Mon Jun 16 15:04:25 2008
@@ -610,6 +610,13 @@
return self.info.pin
end
+
+-- Clear the SN pin when the player is linked
+function clearPin(self)
+ self.info.pin = nil
+end
+
+
--[[
=head2 jive.slim.Player:getSlimServer()
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua?rev=2574&root=Jive&r1=2573&r2=2574&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
Mon Jun 16 15:04:25 2008
@@ -528,7 +528,7 @@
for id, player in pairs(self.players) do
if player:getPin() == pin then
- player:getPin() = nil
+ player:clearPin()
end
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
