Author: titmuss
Date: Fri Jun 27 11:48:36 2008
New Revision: 2636

URL: http://svn.slimdevices.com?rev=2636&root=Jive&view=rev
Log:
Bug: 8584
Description:
Revert Ben's fix, it looks invalid.
Fixed playerNewName notification.

The notifications work on my build here, not sure why Ben is seeing an 
error.


Modified:
    7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua

Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL: 
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2636&root=Jive&r1=2635&r2=2636&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Fri Jun 27 
11:48:36 2008
@@ -303,8 +303,8 @@
        end
 
        -- Check if the player name has changed
-       if oldInfo.playerName ~= self.state.playerName then
-               self.jnt:notify('playerNewName', self, self.info.playerName)
+       if oldInfo.playerName ~= self.info.name then
+               self.jnt:notify('playerNewName', self, self.info.name)
        end
 
        -- Check if the player power status has changed
@@ -512,7 +512,7 @@
 =cut
 --]]
 function getPlayerMode(self)
-       return self.mode
+       return self.state.mode
 end
 
 
@@ -797,6 +797,7 @@
        end
 
        -- update our state in one go
+       local oldState = self.state
        self.state = event.data
 
        -- used for calculating getTrackElapsed(), getTrackRemaining()
@@ -824,8 +825,7 @@
        -- update track list
        local nowPlaying = _whatsPlaying(event.data)
 
-       if self.state.mode ~= self.mode then
-               self.mode = self.state.mode
+       if self.state.mode ~= oldState.mode then
                self.jnt:notify('playerModeChange', self, self.state.mode)
        end
 

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins

Reply via email to