Author: bklaas
Date: Thu Jan 14 15:36:43 2010
New Revision: 8344
URL: http://svn.slimdevices.com/jive?rev=8344&view=rev
Log:
r38...@daddymac-520 (orig r8343): bklaas | 2010-01-14 17:31:08 -0500
Bug: 14870
Description: in the event of an alarmState notification for the local player
and no rtc alarm currently firing, the alarm window should hide
if alarmState is 'active', a new one will be brought to screen
Modified:
7.5/trunk/ (props changed)
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Propchange: 7.5/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jan 14 15:36:43 2010
@@ -12,7 +12,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-autoswitch:5831
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-skin:4552
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8339
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8343
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.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua?rev=8344&r1=8343&r2=8344&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Thu Jan 14 15:36:43 2010
@@ -90,6 +90,12 @@
log:warn('notify_playerAlarmState received for ', player, ' with
alarmState of ', alarmState)
if player:isLocal() then
log:warn('**************************** notify_playerAlarmState
received: ', alarmState, ' ', alarmNext)
+ -- if there's an existing alarm window on the screen and the
rtc alarm isn't firing,
+ -- we're going to hide it in the event of this notification. if
alarmState is 'active', we bring up a new one
+ if self.alarmInProgress ~= 'rtc' then
+ self:_hideAlarmWindow()
+ end
+
if alarmState == 'active' then
if player ~= Player:getCurrentPlayer() then
log:warn('alarm has fired locally, switching to
local player')
@@ -109,7 +115,6 @@
self.alarmInProgress = 'server'
self:_stopTimer()
- self:_hideAlarmWindow()
self:openAlarmWindow('server')
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
