Author: titmuss
Date: Tue Jan 22 13:58:29 2008
New Revision: 1569
URL: http://svn.slimdevices.com?rev=1569&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1553): bklaas | 2008-01-22 16:11:18 +0000
Bug: 6124
Description: don't break encapsulation of player object when accessing
playlist size information
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan 22 13:58:29 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1552
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1553
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
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=1569&root=Jive&r1=1568&r2=1569&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:58:29 2008
@@ -1701,8 +1701,9 @@
-- current playlist should select currently playing item
-- if there is only one item in the playlist, bring the
selected item to top
- -- BUG! breaks player encapsualtion
- local playlistSize = _safeDeref(_player, 'state',
'playlist_tracks')
+ local playerStatus = _player:getPlayerStatus()
+ local playlistSize = playerStatus and
playerStatus.playlist_tracks
+
if playlistSize == 0 then
_statusStep.window:setTitle(_string("SLIMBROWSER_NOW_PLAYING"))
end
@@ -1744,10 +1745,9 @@
function(event)
-- FIXME, next line is a workaround for Bug 6670
_statusStep.window:checkLayout()
- -- a menu size of 3 means a single item
playlist (1 track plus clear/save playlist items)
-- single item playlists are skipped into the
songinfo window
- -- BUG! breaks player encapsulation
- local playlistSize = _safeDeref(_player,
'state', 'playlist_tracks')
+ local playerStatus = _player:getPlayerStatus()
+ local playlistSize = playerStatus and
playerStatus.playlist_tracks
if playlistSize == 1 then
-- need to spoof a key press here to
descend one window further
_statusStep.menu:dispatchNewEvent(EVENT_ACTION)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
