Author: bklaas
Date: Thu Jun 24 09:33:36 2010
New Revision: 8904
URL: http://svn.slimdevices.com/jive?rev=8904&view=rev
Log:
r39...@daddymac-520 (orig r8899): agrundman | 2010-06-21 15:03:16 -0500
Bump Audio::Scan to 0.83
r39...@daddymac-520 (orig r8903): bklaas | 2010-06-22 11:24:45 -0500
Fixed Bug: 15534
Description: fade in fallback alarm volume from 0 to 43 over ~ 10 seconds
cache previous volume so volume is set local player back to whatever it was
before fallback alarm was sounded
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 Thu Jun 24 09:33:36 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:8895
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8903
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=8904&r1=8903&r2=8904&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 Jun 24 09:33:36 2010
@@ -407,11 +407,29 @@
function soundFallbackAlarm(self)
log:warn("soundFallbackAlarm()")
- self.localPlayer:volumeLocal(43)
+ self.alarmVolume = 0 -- start at 0 and fade in
+ -- cache previous volume setting
+ self.previousVolume = self.localPlayer:getVolume()
+ self.localPlayer:volumeLocal(self.alarmVolume)
self.localPlayer:stop(true)
self.alarmInProgress = 'rtc'
self.localPlayer:playFileInLoop(self.alarmTone)
-end
+ self.fadeInTimer = Timer(200,
+ function ()
+ if self.alarmVolume < 43 then
+ log:info("fading in fallback alarm: ",
self.alarmVolume)
+ self.alarmVolume = self.alarmVolume + 1
+
self.localPlayer:volumeLocal(self.alarmVolume)
+ else
+ log:info("stop self.alarmVolume at
reasonable volume (43):", self.alarmVolume)
+ self.fadeInTimer:stop()
+ end
+ end
+ )
+ self.fadeInTimer:start()
+
+end
+
function openAlarmWindow(self, caller)
@@ -597,9 +615,25 @@
end
+function _silenceFallbackAlarm(self)
+ if not self.localPlayer then
+ log:error('No self.localPlayer found!')
+ return
+ end
+ self.localPlayer:stop(true)
+ if self.fadeInTimer and self.fadeInTimer:isRunning() then
+ self.fadeInTimer:stop()
+ end
+ if self.previousVolume then
+ log:warn('setting player back to self.previousVolume: ',
self.previousVolume)
+ self.localPlayer:volumeLocal(self.previousVolume)
+ end
+end
+
+
function _alarmOff(self, stopStream)
if self.alarmInProgress == 'rtc' then
- self.localPlayer:stop(true)
+ self:_silenceFallbackAlarm()
iconbar:setAlarm('OFF')
log:warn('_alarmOff: RTC alarm canceled')
else
@@ -742,7 +776,7 @@
if self.alarmInProgress == 'rtc' then
log:warn('_alarmSnooze: stopping fallback alarm audio')
-- stop playback
- self.localPlayer:stop(true)
+ self:_silenceFallbackAlarm()
else
self.alarmInProgress = 'snooze'
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
