Author: bklaas
Date: Mon Apr 11 15:36:43 2011
New Revision: 9416
URL: http://svn.slimdevices.com/jive?rev=9416&view=rev
Log:
Bug: 17136
Description: this checkin got missed accidentally
add optional continueStream flag on stopAlarm method for player object
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
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=9416&r1=9415&r2=9416&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 Mon Apr 11
15:36:43 2011
@@ -1466,11 +1466,13 @@
self:updateIconbar()
end
-function stopAlarm(self)
+-- optional continueAudio flag cancels alarm without pausing audio
+function stopAlarm(self, continueAudio)
if not self.state then return end
- -- stopAlarm pauses audio
- self:pause()
+ if not continueAudio then
+ self:pause()
+ end
self.alarmState = 'none'
self:call({'jivealarm', 'stop:1'})
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
