Author: bklaas
Date: Tue Aug 3 12:14:53 2010
New Revision: 9011
URL: http://svn.slimdevices.com/jive?rev=9011&view=rev
Log:
Bug: n/a
Description: show choose player during setup if one isn't already selected
if player is selected but not attached to a server, connect it to mysb.com
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=9011&r1=9010&r2=9011&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Tue Aug 3 12:14:53 2010
@@ -271,8 +271,37 @@
appletManager:callService("waitForSqueezenetwork")
end
+ local player = appletManager:callService("getCurrentPlayer")
+ if player then
+ return self:step5()
+ end
+
+ -- find player
+ return appletManager:callService("setupShowSelectPlayer", function()
self:step5() end)
+
+end
+
+
+function step5(self)
self:_setupComplete(false)
self:_setupDone(true)
+
+ -- 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
self.locked = true -- free applet
jnt:unsubscribe(self)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
