Author: bklaas
Date: Thu Jan 20 07:34:00 2011
New Revision: 9291
URL: http://svn.slimdevices.com/jive?rev=9291&view=rev
Log:
Fixed Bug: 15515
Fixed Bug: 16673
Description: use AlarmSnooze's RTC fallback alarm timer state (running or not)
to govern whether an alarm icon is present on the iconbar
This should fix all bugs that involve the iconbar to display the wrong thing
for a upcoming-within-24h alarm
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Thu Jan 20 07:34:00 2011
@@ -678,7 +678,6 @@
function _alarmOff(self, stopStream)
if self.alarmInProgress == 'rtc' then
self:_silenceFallbackAlarm()
- iconbar:setAlarm('OFF')
log:warn('_alarmOff: RTC alarm canceled')
else
if self.localPlayer:isConnected() then
@@ -717,6 +716,9 @@
log:warn('_stopTimer: stopping WOL timer')
self.wakeOnLanTimer:stop()
end
+
+ -- no RTC timer means no alarm, so let's go ahead and remove our alarm
icon
+ iconbar:setAlarm('OFF')
end
@@ -786,6 +788,7 @@
end
self.RTCAlarmTimer:start()
+ iconbar:setAlarm('ON')
end
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Thu Jan 20
07:34:00 2011
@@ -1151,11 +1151,7 @@
iconbar:setSleep('OFF')
end
- if self:getAlarmState() == 'set' or self:getAlarmState() ==
'snooze' then
- iconbar:setAlarm('ON')
- else
- iconbar:setAlarm('OFF')
- end
+ -- alarm icon in iconbar is set directly via AlarmSnoozeApplet
iconbar:setRepeat(0)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
