Author: bklaas
Date: Wed Aug 4 11:50:14 2010
New Revision: 9025
URL: http://svn.slimdevices.com/jive?rev=9025&view=rev
Log:
Bug: n/a
Description: connect to mysb.com when device gets through setup but has not
connected to a server
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=9025&r1=9024&r2=9025&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Wed Aug 4 11:50:14 2010
@@ -191,59 +191,32 @@
appletManager:callService("waitForSqueezenetwork")
end
- self:_setupComplete(false)
- self:_setupDone(true)
-
- self.locked = true -- free applet
- jnt:unsubscribe(self)
-
- jiveMain:goHome()
-
-end
-
-
---[[ XXX: this may need to move to the NetworkRegistrationApplet
-
-function notify_serverLinked(self, server, wasAlreadyLinked)
- log:info("notify_serverLinked: ", server)
-
- if not server:isSqueezeNetwork() then
- return
- end
-
- if not self.registerRequest then
- return
- end
-
- --avoid race condition where we are in the registerRequest but for a
player that is already linked
- if self.registerRequestRequireAlreadyLinked and not wasAlreadyLinked
then
- return
- end
- log:info("server linked: ", server, " pin=", server:getPin(), "
registerRequestRequireAlreadyLinked: ",
self.registerRequestRequireAlreadyLinked, " wasAlreadyLinked: ",
wasAlreadyLinked)
-
- if server:getPin() == false then
- -- for testing connect the player tosqueezenetwork
- local player = appletManager:callService("getCurrentPlayer")
-
- local squeezenetwork = self:_getSqueezenetwork()
- log:info("connecting ", player, " to ", squeezenetwork)
- player:connectToServer(squeezenetwork)
-
- self:step4()
- end
-end
-
-
-function _getSqueezenetwork(self)
+ -- Find squeezenetwork server
local squeezenetwork = false
for name, server in slimServer:iterate() do
if server:isSqueezeNetwork() then
squeezenetwork = server
end
end
- return squeezenetwork
-end
---]]
+
+ -- if player is still not connected, now connect to SN
+ local player = appletManager:callService("getCurrentPlayer")
+ assert(player)
+
+ if not player:getSlimServer() then
+ log:info("connect ", player, " to ", squeezenetwork)
+ player:connectToServer(squeezenetwork)
+ end
+
+ self:_setupComplete(false)
+ self:_setupDone(true)
+
+ self.locked = true -- free applet
+ jnt:unsubscribe(self)
+
+ jiveMain:goHome()
+
+end
function _setupDone(self, setupDone)
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=9025&r1=9024&r2=9025&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_fab4/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Wed Aug 4 11:50:14 2010
@@ -193,6 +193,23 @@
appletManager:callService("waitForSqueezenetwork")
end
+ -- Find squeezenetwork server
+ local squeezenetwork = false
+ for name, server in slimServer:iterate() do
+ if server:isSqueezeNetwork() then
+ squeezenetwork = server
+ end
+ end
+
+ -- if player is still not connected, now connect to SN
+ local player = appletManager:callService("getCurrentPlayer")
+ assert(player)
+
+ if not player:getSlimServer() then
+ log:info("connect ", player, " to ", squeezenetwork)
+ player:connectToServer(squeezenetwork)
+ end
+
-- Once here, network setup is complete
self:_setupComplete(false)
self:_setupDone(true)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
