Author: bklaas
Date: Mon Apr 11 15:31:40 2011
New Revision: 9414
URL: http://svn.slimdevices.com/jive?rev=9414&view=rev
Log:
Fixed Bug: 17136
Description: cancel the alarm on the server when back button is pressed to
dismiss alarm popup
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
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=9414&r1=9413&r2=9414&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
Mon Apr 11 15:31:40 2011
@@ -706,9 +706,9 @@
self:_stopDecodeStatePoller()
- if self.localPlayer:isConnected() and stopStream then
- log:warn('_alarmOff: send stopAlarm to connected server')
- self.localPlayer:stopAlarm()
+ if self.localPlayer:isConnected() then
+ log:warn('_alarmOff: tell server alarm is off, and only pause
if stopStream is true')
+ self.localPlayer:stopAlarm(not stopStream)
end
if self.fallbackAlarmTimeout and self.fallbackAlarmTimeout:isRunning()
then
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=9414&r1=9413&r2=9414&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
Mon Apr 11 15:31:40 2011
@@ -239,6 +239,8 @@
playerWeight = ACTIVATE_WEIGHT
end
+ local server = tostring(player:getSlimServer())
+ playerName = playerName .. '(' .. server .. ')'
local item = {
id = mac,
style = 'item',
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
