Author: bklaas
Date: Wed Jan 13 13:22:21 2010
New Revision: 8333
URL: http://svn.slimdevices.com/jive?rev=8333&view=rev
Log:
r38...@daddymac-520 (orig r8324): mwise | 2010-01-12 18:33:37 -0500
Adding this back in, its performance improvement was extremely useful.
Adjusted its location to be within the parabuild tree at least.
r38...@daddymac-520 (orig r8329): mwise | 2010-01-12 19:43:09 -0500
Back-porting changes from 7.5 build.sh to 7.4
r38...@daddymac-520 (orig r8331): bklaas | 2010-01-13 14:54:23 -0500
Bug: 14870
Description: Use decode:status().audioState as the gold standard for deciding
if audio is coming out the speakers. In my tests this reliably works for both
streaming audio and the client-side fallback alarm.
I believe this checkin may fix the reliability issues such that a user should
be able to depend on something to wake them up at alarm time.
I will fall short of calling this bug fixed, but let's call it "Release
Candidate 1" :)
r38...@daddymac-520 (orig r8332): bklaas | 2010-01-13 15:21:11 -0500
Bug: 14870
Description: if server comes back after rtc alarm has fired, call the
sledgehammer to make sure audio continues to pipe out the speaker.
Modified:
7.5/trunk/ (props changed)
7.5/trunk/squeezeos/poky/parabuild/build.sh
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
Propchange: 7.5/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Jan 13 13:22:21 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:8320
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8332
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/squeezeos/poky/parabuild/build.sh
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeos/poky/parabuild/build.sh?rev=8333&r1=8332&r2=8333&view=diff
==============================================================================
(empty)
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=8333&r1=8332&r2=8333&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
Wed Jan 13 13:22:21 2010
@@ -182,32 +182,18 @@
function _alarm_sledgehammerRearm(self, caller)
local hammer = false
- if self.alarmInProgress == 'server' then
- local status = decode:status()
- -- just informational
- log:warn('alarm_sledgehammerRearm(', caller,'): SERVER alarm in
progress - audioState is ', status.audioState)
-
- if not status.audioState == 1 then
- log:warn('alarm_sledgehammerRearm(', caller,'): SERVER
alarm in progress, but stream is nil - firing fallback alarm')
- hammer = true
- end
- -- restart audio on any state transition from SqueezeOS, but not on
local polls
- --elseif self.alarmInProgress == 'rtc' and caller ~= '_pollDecodeState'
then
- elseif self.alarmInProgress == 'rtc' then
- log:warn('alarm_sledgehammerRearm(', caller,'): RTC alarm
already in progress - restarting alarm audio asynchronously')
+ local status = decode:status()
+ --debug.dump(status)
+
+ log:warn('alarm_sledgehammerRearm(', caller,'): ',
self.alarmInProgress, ' alarm in progress - audioState is ', status.audioState)
+ if status.audioState ~= 1 then
hammer = true
end
-
+
if hammer then
- -- immediately set volume back where it was
- log:warn('alarm_sledgehammerRearm: local volume is ',
self.localPlayer:getVolume())
- --localPlayer:volumeLocal(43);
-
- -- let some time pass so whatever is messing with the player
settings underneath finishes (last request to play wins!)
- -- self:openAlarmWindow('rtc')
-
self:_stopTimer()
-- kickstart audio output again, asynchronously, so whatever
else is messing with the audio settings is hopefully finished
+ log:warn('alarm_sledgehammerRearm: audio not in good shape
while alarm is firing. restart timer asynchronously at 1.5secs')
self:_startTimer(1500)
end
end
@@ -282,9 +268,10 @@
-- don't want to cause error if no connection
if self.localPlayer and self.localPlayer:isConnected() then
log:info(' local player->server is ',
self.localPlayer:getSlimServer())
- end
-
--- self:_alarm_sledgehammerRearm('notify_serverConnected')
+ if self.localPlayer:getSlimServer() == server then
+ self:_alarm_sledgehammerRearm('notify_serverConnected')
+ end
+ end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
