Author: titmuss
Date: Wed Jun 18 03:41:40 2008
New Revision: 2585
URL: http://svn.slimdevices.com?rev=2585&root=Jive&view=rev
Log:
Bug: 6683
Description:
Update currentServer when the current player is attached to a new server.
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua?rev=2585&root=Jive&r1=2584&r2=2585&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SqueezeDiscovery/SqueezeDiscoveryApplet.lua
Wed Jun 18 03:41:40 2008
@@ -414,7 +414,7 @@
-- restart discovery if SqueezeCenter disconnects
function notify_serverDisconnected(self, slimserver)
- log:info("serverDisconnected")
+ log:info("serverDisconnected ", slimserver)
local currentPlayer = Player:getCurrentPlayer()
if not currentPlayer or currentPlayer:getSlimServer() ~= slimserver then
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2585&root=Jive&r1=2584&r2=2585&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Wed Jun 18 03:41:40 2008
@@ -287,6 +287,11 @@
self.slimServer = slimServer
self.slimServer:_addPlayer(self)
+ -- update current server
+ if currentPlayer == self then
+ SlimServer:setCurrentServer(slimServer)
+ end
+
-- player is now available
playerList[self.id] = self
self.jnt:notify('playerNew', self)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
