Author: titmuss
Date: Thu Apr 24 08:28:22 2008
New Revision: 2338
URL: http://svn.slimdevices.com?rev=2338&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2318): bklaas | 2008-04-22 22:40:29 +0100
Bug: 6349
Description: send playerNeedsUpgrade notification on playerstatus updates as
well as serverstatus updates.
This was required to immediately change behavior after user-triggered firmware
update is initiated (playerstatus sends player_is_upgrading flag)
Modified:
7.1/trunk/ (props changed)
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Propchange: 7.1/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Apr 24 08:28:22 2008
@@ -1,4 +1,4 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2302
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2318
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
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=2338&root=Jive&r1=2337&r2=2338&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 Thu Apr 24
08:28:22 2008
@@ -751,6 +751,12 @@
-- update our cache in one go
self.state = event.data
+ -- Update player state
+ local lastNeedsUpgrade = (self.needsUpgrade == 1)
+ local lastIsUpgrading = (self.playerIsUpgrading == 1)
+ self.needsUpgrade = (tonumber(event.data.player_needs_upgrade) == 1)
+ self.playerIsUpgrading = (tonumber(event.data.player_is_upgrading) == 1)
+
-- used for calculating getTrackElapsed(), getTrackRemaining()
self.trackSeen = Framework:getTicks() / 1000
self.trackCorrection = 0
@@ -762,6 +768,10 @@
_setPlayerPower(self, tonumber(event.data.power))
_setPlayerModeChange(self, event.data.mode)
+
+ if self.needsUpgrade ~= lastNeedsUpgrading or self.playerIsUpgrading ~=
lastIsUpgrading then
+ self.jnt:notify('playerNeedsUpgrade', self,
self:isNeedsUpgrade(), self:isUpgrading())
+ end
local nowPlaying = _whatsPlaying(event.data)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
