Author: titmuss
Date: Tue Jul 8 09:13:38 2008
New Revision: 2674
URL: http://svn.slimdevices.com?rev=2674&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix applet load ordering, SlimBrowser needs to be before SlimDiscovery (work
around until
bug 8669 is fixed).
Fix connecting to SN when jive starts in 'searching' or 'probing' state.
Fix incorrect state change to 'connected' state.
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua?rev=2674&root=Jive&r1=2673&r2=2674&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
Tue Jul 8 09:13:38 2008
@@ -108,14 +108,19 @@
local server = SlimServer(jnt, name)
-- update SqueezeCenter address
- server:updateAddress(ip, port)
-
- if self.state == 'searching'
- or self.state == 'probing' then
-
- -- connect to server when searching or probing
- server:connect()
- end
+ self:_serverUpdateAddress(server, ip, port)
+ end
+end
+
+
+function _serverUpdateAddress(self, server, ip, port)
+ server:updateAddress(ip, port)
+
+ if self.state == 'searching'
+ or self.state == 'probing' then
+
+ -- connect to server when searching or probing
+ server:connect()
end
end
@@ -258,7 +263,7 @@
-- Special case Squeezenetwork
if jnt:getUUID() then
squeezenetwork = SlimServer(jnt, "SqueezeNetwork")
- squeezenetwork:updateAddress(jnt:getSNHostname(), 9000)
+ self:_serverUpdateAddress(squeezenetwork, jnt:getSNHostname(),
9000)
end
-- Remove SqueezeCenters that have not been seen for a while
@@ -273,7 +278,7 @@
local currentPlayer = Player:getCurrentPlayer()
- if currentPlayer and currentPlayer:getSlimServer() then
+ if currentPlayer and currentPlayer:isConnected() then
self:_setState('connected')
else
self:_setState('searching')
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua?rev=2674&root=Jive&r1=2673&r2=2674&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryMeta.lua
Tue Jul 8 09:13:38 2008
@@ -64,9 +64,15 @@
meta:registerService("getPollList")
meta:registerService("setPollList")
-
-- SlimDiscovery is a resident Applet
local slimDiscovery = appletManager:loadApplet("SlimDiscovery")
+
+
+ -- FIXME See Bug 8669
+ -- SlimBrowser needs to be loaded first, so it gets notifications from
+ -- the code below.
+ appletManager:loadApplet("SlimBrowser")
+
local player, server
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
