Author: agrundman
Date: Tue Sep 13 07:02:24 2011
New Revision: 9527
URL: http://svn.slimdevices.com/jive?rev=9527&view=rev
Log:
r79605@andy-imac (orig r9511): bklaas | 2011-09-12 12:28:17 -0400
Fixed Bug: 17529
Description: remove recently code that had been added to playerTrackChange
notification.
change push to NP code in playerPlaylistChange notification to only push when
transitioning from empty playlist to non-empty playlist
this covers the special case where the empty playlist window (pushed to via
TouchToPlay) is removed as the playlist becomes non-empty,
and the user should still be pushed to NP
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 Tue Sep 13 07:02:24 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:9508
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9511
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=9527&r1=9526&r2=9527&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
Tue Sep 13 07:02:24 2011
@@ -3661,7 +3661,18 @@
appletManager:callService("hideNowPlaying")
return
- end
+ -- Bug 17529: Only push to NowPlaying if the playlist now has size, and
an emptyStep window currently exists
+ -- in other words, we're moving from an empty playlist (special case NP
window that says "Nothing") to a non-empty playlist
+ -- so in this case only, we need to explicitly push to NowPlaying and
remove the emptyStep window
+ elseif playlistSize and emptyStep and emptyStep.window then
+ -- only move into NowPlaying if screensaver is allowed
+ if Window:getTopNonTransientWindow():canActivateScreensaver()
then
+ _goNowPlaying(nil, true)
+ end
+ emptyStep.window:hide()
+ _emptyStep = nil
+ end
+
-- update the window
step.db:updateStatus(playerStatus)
step.menu:reLayout()
@@ -3686,18 +3697,6 @@
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
_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
