Author: titmuss
Date: Tue Jun 17 09:13:28 2008
New Revision: 2577
URL: http://svn.slimdevices.com?rev=2577&root=Jive&view=rev
Log:
Bug: 6683
Description:
In Choose Player only display check against player name if the player is
connected to
SC.
Fixed a typo when freeing a player.
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=2577&root=Jive&r1=2576&r2=2577&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
Tue Jun 17 09:13:28 2008
@@ -201,7 +201,7 @@
weight = playerWeight
}
- if player == self.selectedPlayer then
+ if player == self.selectedPlayer and player:isConnected() then
item.style = "checked"
end
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=2577&root=Jive&r1=2576&r2=2577&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 09:13:28 2008
@@ -377,7 +377,7 @@
self.jnt:notify('playerDelete', self)
- if self.slimserver then
+ if self.slimServer then
self.slimServer:_deletePlayer(self)
self:offStage()
self.slimServer = false
@@ -1088,11 +1088,7 @@
-- tell the player to connect to another server
function connectToServer(self, server)
- log:warn("*******************")
-
if self.config == "needsServer" then
- log:warn("UDAP ####################")
-
_udapConnect(self, server)
return
Modified:
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
URL:
http://svn.slimdevices.com/7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua?rev=2577&root=Jive&r1=2576&r2=2577&view=diff
==============================================================================
---
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
(original)
+++
7.1/branches/discovery-refactor/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
Tue Jun 17 09:13:28 2008
@@ -170,7 +170,7 @@
end
-- update player state
-
self.players[player_info.playerid]:updatePlayerInfo(self, player_info)
+ self.players[playerId]:updatePlayerInfo(self,
player_info)
end
else
log:info(self, ": has no players!")
@@ -180,7 +180,6 @@
for k,v in pairs(selfPlayers) do
player = self.players[k]
-- wave player bye bye
--- XXXX do we mean to free here, it should just unlink the player for SC
player:free(self)
self.players[k] = nil
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
