Author: agrundman
Date: Mon Sep 5 18:48:57 2011
New Revision: 9501
URL: http://svn.slimdevices.com/jive?rev=9501&view=rev
Log:
r79465@andy-imac (orig r9500): mherger | 2011-09-05 10:05:08 -0400
Fixed Bug: 17529
Description: Ben's patch to improve "jump to now playing screen" behaviour
approved :-). Thanks Ben!
Modified:
7.6/branches/usb-audio/ (props changed)
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: 7.6/branches/usb-audio/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Sep 5 18:48:57 2011
@@ -15,7 +15,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/private-branches/7.5.3-rc:9282
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9408
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9497
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9500
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/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=9501&r1=9500&r2=9501&view=diff
==============================================================================
---
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Mon Sep 5 18:48:57 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
