Author: bklaas
Date: Tue Jun 1 12:47:14 2010
New Revision: 8838
URL: http://svn.slimdevices.com/jive?rev=8838&view=rev
Log:
r39...@daddymac-520 (orig r8836): agrundman | 2010-06-01 11:31:10 -0500
Change the color of the spectrum analyzer cap to one that doesn't have the MSB
bit set, as this causes expensive alpha-blending for an unknown reason on fab4
but not desktop
r39...@daddymac-520 (orig r8837): bklaas | 2010-06-01 14:44:37 -0500
Fixed Bug: 16230
Description: initialize self.localPlayer for local players that call
notify_playerCurrent()
if self.localPlayer is not available when openAlarmWindow() is called, try to
get it then as well
Modified:
7.6/trunk/ (props changed)
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/AlarmSnooze/AlarmSnoozeApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
Propchange: 7.6/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jun 1 12:47:14 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:8826
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8837
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=8838&r1=8837&r2=8838&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
Tue Jun 1 12:47:14 2010
@@ -282,6 +282,9 @@
function notify_playerCurrent(self, player)
log:info("notify_playerCurrent(", player, ")")
+ if player:isLocal() then
+ self.localPlayer = player
+ end
end
@@ -408,6 +411,17 @@
end
function openAlarmWindow(self, caller)
+
+ -- Bug 16230: if self.localPlayer hasn't been set, try to here as it's
essential to the alarm working
+ if not self.localPlayer then
+ log:warn('openAlarmWindow: called without self.localPlayer
being set. try to acquire it now')
+ self.localPlayer = Player:getLocalPlayer()
+ -- if that returns nil (very unlikely), throw an error and
return
+ if not self.localPlayer then
+ log:error('openAlarmWindow: without self.localPlayer
the alarm cannot sound')
+ return
+ end
+ end
log:warn('openAlarmWindow()', caller, ' ',
self.localPlayer:isConnected())
@@ -462,10 +476,6 @@
log:warn('openAlarmWindow: fallback alarm activation')
else
log:warn('openAlarmWindow: fallback alarm snooze or
explicit audio cycle')
- end
- if not self.localPlayer then
- log:warn('openAlarmWindow: cannot play an alarm without
a player')
- return
end
self:soundFallbackAlarm()
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAlargeSkin/WQVGAlargeSkinApplet.lua?rev=8838&r1=8837&r2=8838&view=diff
==============================================================================
(empty)
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/WQVGAsmallSkin/WQVGAsmallSkinApplet.lua?rev=8838&r1=8837&r2=8838&view=diff
==============================================================================
(empty)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
