Author: titmuss
Date: Wed Feb 13 09:26:29 2008
New Revision: 1933
URL: http://svn.slimdevices.com?rev=1933&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1919): bklaas | 2008-02-12 21:51:16 +0000
Bug: 6667
Description: patch from Richard that properly keeps track of players table
so Choose Player menu item is managed correctly
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/jive/slim/Player.lua
trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Feb 13 09:26:29 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1918
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1919
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/jive/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/slim/Player.lua?rev=1933&root=Jive&r1=1932&r2=1933&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/slim/Player.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/slim/Player.lua Wed Feb 13 09:26:29 2008
@@ -141,9 +141,10 @@
local function _setPlayerPower(self, power)
log:debug("_setPlayerPower")
+ power = tonumber(power)
if power != self.power then
- self.power = tonumber(power)
- self.jnt:notify('playerPower', self, tonumber(power))
+ self.power = power
+ self.jnt:notify('playerPower', self, power)
end
end
@@ -255,7 +256,7 @@
-- notify of new player
log:info(obj, " new for ", obj.slimServer)
- jnt:notify('playerNew', obj)
+ obj.slimServer:_addPlayer(obj)
return obj
end
@@ -280,13 +281,13 @@
if self.slimServer ~= slimServer then
-- delete from old server
if self.slimServer then
- self.slimServer:_deletePlayer(self)
+ self:free(self.slimServer)
end
-- add to new server
self.slimServer = slimServer
+ self.slimServer:_addPlayer(self)
log:info(self, " new for ", self.slimServer)
- self.jnt:notify('playerNew', self)
end
self.model = playerInfo.model
@@ -429,7 +430,7 @@
end
log:info(self, " delete for ", self.slimServer)
- self.jnt:notify('playerDelete', self)
+ self.slimServer:_deletePlayer(self)
self:offStage()
self.slimServer = nil
Modified: trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua?rev=1933&root=Jive&r1=1932&r2=1933&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/slim/SlimServer.lua Wed Feb 13 09:26:29
2008
@@ -157,8 +157,6 @@
player = Player(self.jnt, self, player_info)
- self.players[player_info.playerid] = player
-
else
-- update existing players
self.players[player_info.playerid]:update(self,
player_info)
@@ -180,8 +178,14 @@
-- package private method to delete a player
function _deletePlayer(self, player)
- player:free(self)
- table:delete(self.players, player:getId())
+ self.players[player:getId()] = nil
+ self.jnt:notify('playerDelete', player)
+end
+
+
+function _addPlayer(self, player)
+ self.players[player:getId()] = player
+ self.jnt:notify('playerNew', player)
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
