Author: bklaas
Date: Wed Jul 28 12:03:13 2010
New Revision: 9000
URL: http://svn.slimdevices.com/jive?rev=9000&view=rev
Log:
r40...@daddymac-520 (orig r8994): bklaas | 2010-07-27 09:04:29 -0500
Bug: 16402
Description: back port previous 7.6 alarm checkin to 7.5/trunk
r40...@daddymac-520 (orig r8996): bklaas | 2010-07-27 13:09:16 -0500
Fixed Bug: 16402
Description: make fallback alarm timer timeout a one-time alarm
Modified:
7.6/trunk/ (props changed)
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Propchange: 7.6/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Jul 28 12:03:13 2010
@@ -13,7 +13,7 @@
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:8423
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8982
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8996
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.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=9000&r1=8999&r2=9000&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
Wed Jul 28 12:03:13 2010
@@ -459,7 +459,8 @@
log:warn('rtc alarm has timed
out')
self:_alarmOff()
end
- end
+ end,
+ true
)
if self.fallbackAlarmTimeout:isRunning() then
self.fallbackAlarmTimeout:restart()
@@ -668,6 +669,7 @@
self.localPlayer:volumeLocal(self.previousVolume)
end
if self.fallbackAlarmTimeout and self.fallbackAlarmTimeout:isRunning()
then
+ log:warn('stopping fallback alarm timeout timer')
self.fallbackAlarmTimeout:stop()
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
