Author: bklaas
Date: Wed Sep 3 14:37:17 2008
New Revision: 2905
URL: http://svn.slimdevices.com?rev=2905&root=Jive&view=rev
Log:
Bug: 7873
Description: avoid loadApplet() where callService() will work just as well
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/HttpAuth/HttpAuthMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/HttpAuth/HttpAuthMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/HttpAuth/HttpAuthMeta.lua?rev=2905&root=Jive&r1=2904&r2=2905&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/HttpAuth/HttpAuthMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/HttpAuth/HttpAuthMeta.lua
Wed Sep 3 14:37:17 2008
@@ -39,11 +39,15 @@
end
function registerApplet(meta)
+
+ meta:registerService('squeezeCenterPassword')
+
local settings = meta:getSettings()
for servername, cred in pairs(settings) do
SlimServer:setCredentials(cred, servername)
end
+
end
--[[
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua?rev=2905&root=Jive&r1=2904&r2=2905&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
Wed Sep 3 14:37:17 2008
@@ -531,6 +531,12 @@
return window
end
+-- wrapper method to allow openScreensaver to remain as named so the
"screensaver"
+-- can be found by the Screensaver applet correctly,
+-- while allowing the method to be called via the service API
+function goNowPlaying(self, style, transition)
+ self:openScreensaver(style, transition)
+end
function openScreensaver(self, style, transition)
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingMeta.lua?rev=2905&root=Jive&r1=2904&r2=2905&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingMeta.lua
Wed Sep 3 14:37:17 2008
@@ -21,6 +21,9 @@
end
function registerApplet(self)
+
+ self:registerService('goNowPlaying')
+
local ssMgr = appletManager:loadApplet("ScreenSavers")
if ssMgr ~= nil then
ssMgr:addScreenSaver(
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua?rev=2905&root=Jive&r1=2904&r2=2905&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SelectPlayer/SelectPlayerMeta.lua
Wed Sep 3 14:37:17 2008
@@ -38,6 +38,8 @@
function registerApplet(meta)
+ meta:registerService('setupShow')
+
-- SelectPlayer is a resident Applet, Applet loads all menus necessary
appletManager:loadApplet("SelectPlayer")
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua?rev=2905&root=Jive&r1=2904&r2=2905&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
Wed Sep 3 14:37:17 2008
@@ -17,6 +17,7 @@
function registerApplet(meta)
+ meta:registerService("startSqueezeboxSetup")
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2905&root=Jive&r1=2904&r2=2905&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Wed Sep 3 14:37:17 2008
@@ -814,8 +814,7 @@
transition = Window.transitionPushRight
end
Framework:playSound("WINDOWSHOW")
- local NowPlaying = appletManager:loadApplet("NowPlaying")
- NowPlaying:openScreensaver('browse', transition)
+ appletManager:callService('goNowPlaying', 'browse', transition)
end
-- _goPlaylist
@@ -2447,8 +2446,7 @@
menu:addItem({
text = self:string("SLIMBROWSER_ENTER_PASSWORD"),
callback = function()
- local auth =
appletManager:loadApplet("HttpAuth")
- auth:squeezeCenterPassword(server)
+
appletManager:callService('squeezeCenterPassword', server)
end,
sound = "WINDOWSHOW",
})
@@ -2460,9 +2458,7 @@
text =
self:string("SLIMBROWSER_CHOOSE_MUSIC_SOURCE"),
callback = function()
appletManager:callService("setCurrentPlayer", nil)
-
- local setupSqueezebox =
appletManager:loadApplet("SetupSqueezebox")
-
setupSqueezebox:startSqueezeboxSetup(player:getMacAddress(), nil)
+
appletManager:callService('startSqueezeboxSetup', player:getMacAddress(), nil)
end,
sound = "WINDOWSHOW",
})
@@ -2475,9 +2471,7 @@
text =
self:string("SLIMBROWSER_CHOOSE_PLAYER"),
callback = function()
appletManager:callService("setCurrentPlayer", nil)
-
- local selectPlayer =
appletManager:loadApplet("SelectPlayer")
- selectPlayer:setupShow()
+
appletManager:callService("setupShow")
end,
sound = "WINDOWSHOW",
})
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
