Author: bklaas
Date: Wed Oct 22 13:00:01 2008
New Revision: 3190
URL: http://svn.slimdevices.com?rev=3190&root=Jive&view=rev
Log:
Bug: 8159, 9770
Description: back port 7.3 checkin r3188 to 7.1 branch (for 7.2.1 firmware)
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimDiscovery/SlimDiscoveryApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.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=3190&root=Jive&r1=3189&r2=3190&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
Wed Oct 22 13:00:01 2008
@@ -505,7 +505,7 @@
end
-- restart discovery when we have no player
- if player and player:getSlimServer() then
+ if player and player:isConnected() then
self:_setState('connected')
else
self:_setState('searching')
@@ -532,7 +532,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.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=3190&root=Jive&r1=3189&r2=3190&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Wed Oct 22 13:00:01 2008
@@ -1092,6 +1092,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
