Author: bklaas
Date: Tue Jan 19 13:07:25 2010
New Revision: 8375
URL: http://svn.slimdevices.com/jive?rev=8375&view=rev
Log:
Bug: 14870
Description:
- allow Player:alarmStop() to be executed when self.alarmState is not 'active'
- 9 minute snooze timer is set on a snooze event regardless of what type of
alarmInProgress it is.
- self.alarmInProgress is explicitly set to 'snooze' when the snooze command is
sent
- self.alarmInProgress is explicitly set to 'snooze' on an alarmState
notification of 'snooze'
- serverDisconnected notification is now set to not fire a fallback alarm when
alarmInProgress is set to snooze (instead, wait for the snooze timer to expire)
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua?rev=8375&r1=8374&r2=8375&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Tue Jan 19 13:07:25 2010
@@ -121,8 +121,8 @@
elseif alarmState == 'snooze' then
log:warn('snooze state received')
- -- just leave state as in progress for now
- -- self.alarmInProgress = alarmState
+ self.alarmInProgress = alarmState
+ log:warn('self.alarmInProgress set to: ',
self.alarmInProgress)
elseif alarmState == 'none' then
@@ -284,7 +284,9 @@
log:info('notify_serverDisconnected: ', server, ' is now disconnected')
-- blindly check state here irrespective of which server caused this
notification
- if self.alarmInProgress and self.alarmInProgress ~= 'rtc' then
+ if self.alarmInProgress == 'snooze' or self.alarmInProgress == 'rtc'
then
+ log:warn('notify_serverDisconnected: ', server, ' -
disconnected, but no server alarm in progress : ', self.alarmInProgress)
+ elseif self.alarmInProgress == 'server' then
if not self.localPlayer:isConnected() then
log:warn('notify_serverDisconnected: ', server, ' -
while server alarm in progress! state ', self.alarmInProgress, ' triggering
fallback alarm!')
self:openAlarmWindow('rtc')
@@ -496,6 +498,7 @@
end
self.alarmInProgress = nil
self.alarmWindow = nil
+ log:warn('self.alarmInProgress set to: ',
self.alarmInProgress)
end
)
@@ -526,6 +529,7 @@
end
if self.localPlayer:isConnected() and stopStream then
+ log:warn('_alarmOff: send stopAlarm to connected server')
self.localPlayer:stopAlarm()
end
end
@@ -595,27 +599,27 @@
function _alarmSnooze(self)
log:warn('_alarmSnooze: alarmInProgress is ', self.alarmInProgress, ' :
connection status is ', self.localPlayer:isConnected())
+
+ log:warn('_alarmSnooze: fallback alarm snoozing for hardwired 9
minutes')
+ self:_stopTimer()
+ -- start another hardwired timer for 9 minutes
+ self:_startTimer(540000)
+ --self:_startTimer(20000)
if self.alarmInProgress == 'rtc' then
+ log:warn('_alarmSnooze: stopping fallback alarm audio')
-- stop playback
self.localPlayer:stop(true)
- log:warn('_alarmSnooze: fallback alarm snoozing for hardwired 9
minutes')
- self:_stopTimer()
- -- start another hardwired timer for 9 minutes
- --self:_startTimer(60000)
- self:_startTimer(540000)
- else
- if self.localPlayer:isConnected() then
- self.localPlayer:snooze()
- else
- -- playerDisconnect event should be hit first, but for
completeness...
- log:warn('_alarmSnooze: lost connection after server
alarm notification! triggering fallback alarm')
- self:openAlarmWindow('rtc')
- end
+ end
+
+ if self.localPlayer:isConnected() then
+ log:warn('_alarmSnooze: sending snooze command to connected
server for connected player ', self.localPlayer)
+ self.localPlayer:snooze()
end
self.alarmWindow:playSound("WINDOWHIDE")
self:_hideAlarmWindow()
+ self.alarmInProgress = 'snooze'
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
