Author: titmuss
Date: Tue Jun 17 15:00:58 2008
New Revision: 2583
URL: http://svn.slimdevices.com?rev=2583&root=Jive&view=rev
Log:
Bug: 6683
Description:
Keep the server linked to the player when then player is detected via udap or
ad-hoc
network, otherwise slimbrowser removes the menus.
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua?rev=2583&root=Jive&r1=2582&r2=2583&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
Tue Jun 17 15:00:58 2008
@@ -169,7 +169,7 @@
-- I<path> is the absolute path to the servers cometd handler and defaults to
-- '/cometd'.
function setEndpoint(self, ip, port, path)
- log:error(self, ": ***************** setEndpoint state=", self.state,
", ", ip, ", ", port, ", ", path)
+ log:error(self, ": setEndpoint state=", self.state, ", ", ip, ", ",
port, ", ", path)
local oldState = self.state
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=2583&root=Jive&r1=2582&r2=2583&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
Tue Jun 17 15:00:58 2008
@@ -326,11 +326,6 @@
self.lastSeen = Framework:getTicks()
- -- The player is no longer connected to SqueezeCenter
- if self.slimServer then
- self:free(self.slimServer)
- end
-
-- player is now available
playerList[self.id] = self
@@ -367,11 +362,6 @@
self.info.connected = false
self.lastSeen = lastScan
-
- -- The player is no longer connected to SqueezeCenter
- if self.slimServer then
- self:free(self.slimServer)
- end
-- player is now available
playerList[self.id] = self
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
