Author: titmuss
Date: Wed Oct 22 14:11:29 2008
New Revision: 3194
URL: http://svn.slimdevices.com?rev=3194&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r3188): titmuss | 2008-10-22 18:26:42 +0100
Bug: 8159
Description:
Fix a couple of state transitions that may result in connection problems in
SlimDiscovery.
Fix the case in bug 8159 comment #14. Note for me this did not result in
'dead' blue icon, it was possible to recover from this case
by drilling into the menus or entering choose player.
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Oct 22 14:11:29 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3185
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3188
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua?rev=3194&root=Jive&r1=3193&r2=3194&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
Wed Oct 22 14:11:29 2008
@@ -427,7 +427,9 @@
end
-- start discovery looking for the player
- self:_setState('searching')
+ if self.state == 'connected' then
+ self:_setState('searching')
+ end
end
@@ -532,7 +534,7 @@
function connectPlayer(self)
local player = Player:getCurrentPlayer()
- if currentPlayer and currentPlayer:getSlimServer() then
+ if currentPlayer and currentPlayer:isConnected() then
self:_setState("connected")
else
self:_setState("searching")
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=3194&root=Jive&r1=3193&r2=3194&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Wed Oct 22 14:11:29 2008
@@ -1088,6 +1088,9 @@
if not wirelessWasConnected and status and status.wpa_state
or (status.wpa_state == "COMPLETED" and
status.ip_address and (not string.match(status.ip_address, "^169.254.") or
zeroconf)) then
+ -- restart discovery
+ appletManager:callService("connectPlayer")
+
-- force connection to SlimServer
if wirelessWasConnected then
jnt:notify("networkConnected")
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
