Author: bklaas
Date: Wed Apr 28 15:10:50 2010
New Revision: 8745
URL: http://svn.slimdevices.com/jive?rev=8745&view=rev
Log:
Bug: 9057
Description: call player:stopPreview() when alarm preview window is exited.
Requires up-to-date 7.5.1 SBS for this to function properly.
unrelated to 9057:
allow a showBriefly to bring up a persistent window when duration is -1
debug message for choose player window debugging
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua?rev=8745&r1=8744&r2=8745&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerApplet.lua
Wed Apr 28 15:10:50 2010
@@ -211,6 +211,7 @@
}
local playerModel = player:getModel()
+ log:debug("Player: ", player, ' is model: ', playerModel)
-- guess model by mac address if we don't have one available
-- this is primarily used for players on the network waiting to be setup
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=8745&r1=8744&r2=8745&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Wed Apr 28 15:10:50 2010
@@ -2116,7 +2116,7 @@
local windowPopAction = function()
log:warn('window goes pop!')
- _player:pause()
+ _player:stopPreview()
return EVENT_CONSUME
end
Modified: 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=8745&r1=8744&r2=8745&view=diff
==============================================================================
--- 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Wed Apr 28
15:10:50 2010
@@ -1385,7 +1385,11 @@
s.textarea:setValue(textValue)
end
if showMe then
- s.window:showBriefly(duration, nil, transitionOn,
transitionOff)
+ if tonumber(duration) == -1 then
+ s.window:show()
+ else
+ s.window:showBriefly(duration, nil,
transitionOn, transitionOff)
+ end
end
end
end
@@ -1405,6 +1409,14 @@
elseif paused == 'play' then
self:pause()
end
+end
+
+
+function stopPreview(self)
+ if not self.state then return end
+ self:call({'playlist', 'preview', 'cmd:stop' })
+ self:updateIconbar()
+
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
