Author: titmuss
Date: Tue Jan 22 13:55:25 2008
New Revision: 1559
URL: http://svn.slimdevices.com?rev=1559&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1544): bklaas | 2008-01-21 21:37:22 +0000
Bug: 6124
Description:
add style albumitemNoAction to support single 'nothing' item sent from SC when
playlist is empty
query playerStatus.playlist_tracks for playlist size in NowPlaying to
determine whether to push back to SlimBrowser
set title in SlimBrowser to token NOW_PLAYING when playlist is empty
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua
trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan 22 13:55:25 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1543
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1544
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=1559&root=Jive&r1=1558&r2=1559&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/DefaultSkin/DefaultSkinApplet.lua Tue
Jan 22 13:55:25 2008
@@ -960,6 +960,10 @@
s.albumitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork.png")
s.albumitem.icon.padding = { 8, 0, 0, 0 }
+ s.albumitemNoAction = _uses(s.albumitem, {
+ order = { 'text' }
+ })
+ s.selected.albumitemNoAction = _uses(s.albumitemNoAction)
-- selected item with artwork and song info
s.selected.albumitem = {}
@@ -967,6 +971,7 @@
s.selected.albumitem.text.fg = SELECT_COLOR
s.selected.albumitem.text.sh = SELECT_SH_COLOR
s.selected.albumitem.bgImg = albumSelectionBox
+
-- locked item with artwork and song info
Modified: trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua?rev=1559&root=Jive&r1=1558&r2=1559&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/NowPlaying/NowPlayingApplet.lua Tue
Jan 22 13:55:25 2008
@@ -560,10 +560,11 @@
function openScreensaver(self, style, transition)
- -- an empty item_loop means an empty playlist
+ -- playlist_tracks needs to be > 0 or else defer back to SlimBrowser
if not self.player
or not self.player.playerStatus
- or not self.player.playerStatus.item_loop then
+ or not self.player.playerStatus.playlist_tracks
+ or self.player.playerStatus.playlist_tracks ==
0 then
local browser = appletManager:getAppletInstance("SlimBrowser")
browser:showPlaylist()
return
Modified:
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=1559&root=Jive&r1=1558&r2=1559&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Tue
Jan 22 13:55:25 2008
@@ -1381,8 +1381,10 @@
style = "albumcurrent"
elseif item and item["style"] then
style = item["style"]
- end
-
+log:warn(style)
+ end
+
+log:warn(style)
widgets[widgetIndex] = _decoratedLabel(widget, style,
item, db, menuAccel)
end
end
@@ -1690,10 +1692,14 @@
-- current playlist should select currently playing item
-- if there is only one item in the playlist, bring the
selected item to top
local playlistSize = _safeDeref(_player, 'playerStatus',
'playlist_tracks')
- if playlistSize == 1 then
+ if playlistSize == 0 then
+
_statusStep.window:setTitle(_string("SLIMBROWSER_NOW_PLAYING"))
+ end
+
+ if playlistSize <= 1 then
_statusStep.menu["_lastSelectedIndex"] = 1
_statusStep.menu["_lastSelectedOffset"] = 1
- _statusStep.menu.selected = 1
+ _statusStep.menu.selected = 1
_statusStep.menu:_updateWidgets()
-- otherwise bring the currently playing item to the screen
with offset of 2
elseif _statusStep.menu.list.currentIndex then
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
