Author: bklaas
Date: Mon Jul 7 14:37:39 2008
New Revision: 2671
URL: http://svn.slimdevices.com?rev=2671&root=Jive&view=rev
Log:
Bug: 7914
Description: expand key listener for center button for both browse and
screensaver mode
use new service registration for using slimBrowser methods to access playlist
and trackinfo windows
don't violate encapsulation when getting playlist size
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua?rev=2671&root=Jive&r1=2670&r2=2671&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
Mon Jul 7 14:37:39 2008
@@ -418,34 +418,31 @@
end
)
- if windowStyle == 'browse' then
- local browser = appletManager:getAppletInstance("SlimBrowser")
- local playerStatus = self.player and
self.player:getPlayerStatus()
- local playlistSize = playerStatus and
playerStatus.playlist_tracks
- self[windowStyle].listeners[2] = window:addListener(
- EVENT_KEY_PRESS,
- function(event)
- local type = event:getType()
- local keyPress = event:getKeycode()
- if (keyPress == KEY_BACK) then
- -- back to Home
- browser:goHome()
- return EVENT_CONSUME
-
- elseif (keyPress == KEY_GO) then
- if playlistSize == 1 then
- -- use special showTrackOne
method from SlimBrowser
- browser:showTrackOne()
- else
- -- show playlist
- browser:showPlaylist()
- end
- return EVENT_CONSUME
+ local playlistSize = self.player and self.player:getPlaylistSize()
+
+ self[windowStyle].listeners[2] = window:addListener(
+ EVENT_KEY_PRESS,
+ function(event)
+ local type = event:getType()
+ local keyPress = event:getKeycode()
+ if (keyPress == KEY_BACK and windowStyle == 'browse')
then
+ -- back to Home
+ appletManager:callService("goHome")
+ return EVENT_CONSUME
+
+ elseif (keyPress == KEY_GO) then
+ if playlistSize == 1 then
+ -- use special showTrackOne method from
SlimBrowser
+
appletManager:callService("showTrackOne")
+ else
+ -- show playlist
+
appletManager:callService("showPlaylist")
end
- return EVENT_UNUSED
+ return EVENT_CONSUME
end
- )
- end
+ return EVENT_UNUSED
+ end
+ )
end
----------------------------------------------------------------------------------------
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua?rev=2671&root=Jive&r1=2670&r2=2671&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
Mon Jul 7 14:37:39 2008
@@ -41,6 +41,11 @@
jul.addCategory("player.browse.db", jul.WARN)
jul.addCategory("player.browse.data", jul.WARN)
+
+ self:registerService('goHome')
+ self:registerService('showTrackOne')
+ self:registerService('showPlaylist')
+
appletManager:loadApplet("SlimBrowser")
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
