Author: mherger
Date: Mon Sep 5 07:05:08 2011
New Revision: 9500
URL: http://svn.slimdevices.com/jive?rev=9500&view=rev
Log:
Fixed Bug: 17529
Description: Ben's patch to improve "jump to now playing screen" behaviour
approved :-). Thanks Ben!
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=9500&r1=9499&r2=9500&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Mon Sep 5 07:05:08 2011
@@ -3661,19 +3661,7 @@
appletManager:callService("hideNowPlaying")
return
- -- make sure we have step.window replace emptyStep.window when there
are tracks and emptyStep exists
- elseif _player:isPowerOn() and playlistSize then
- -- only move into NowPlaying if screensaver is allowed
- if Window:getTopNonTransientWindow():canActivateScreensaver()
then
- _goNowPlaying(nil, true)
- end
- if emptyStep and emptyStep.window then
- emptyStep.window:hide()
- end
- _emptyStep = nil
-
- end
-
+ end
-- update the window
step.db:updateStatus(playerStatus)
step.menu:reLayout()
@@ -3696,7 +3684,20 @@
end
local playerStatus = player:getPlayerStatus()
+ local playlistSize = _player:getPlaylistSize()
local step = _statusStep
+
+ if _player:isPowerOn() and playlistSize then
+ -- only move into NowPlaying if screensaver is allowed
+ if Window:getTopNonTransientWindow():canActivateScreensaver()
then
+ _goNowPlaying(nil, true)
+ end
+ -- make sure we have step.window replace emptyStep.window when
there are tracks and emptyStep exists
+ if emptyStep and emptyStep.window then
+ emptyStep.window:hide()
+ end
+ _emptyStep = nil
+ end
step.db:updateStatus(playerStatus)
if step.db:playlistIndex() then
@@ -3812,6 +3813,7 @@
_statusSink
)
_statusStep = step
+ _statusStep.window:setAllowScreensaver(false)
-- make sure it has our modifier (so that we use different default
action in Now Playing)
_statusStep.actionModifier = "-status"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
