Author: bklaas
Date: Wed Sep 10 12:58:27 2008
New Revision: 2912
URL: http://svn.slimdevices.com?rev=2912&root=Jive&view=rev
Log:
Bug: 7873
Description: a couple more spots where loadApplet() could be replaced with
service API calls
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua?rev=2912&root=Jive&r1=2911&r2=2912&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
Wed Sep 10 12:58:27 2008
@@ -52,8 +52,6 @@
function registerApplet(meta)
- -- we depend on the SlimDiscovery applet
- appletManager:loadApplet("SlimDiscovery")
meta:registerService("selectMusicSource")
@@ -62,7 +60,7 @@
appletManager:callService("setPollList",
meta:getSettings().poll)
jiveMain:addItem(menuItem)
-end
+ end
jnt:subscribe(meta)
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=2912&root=Jive&r1=2911&r2=2912&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 10 12:58:27 2008
@@ -32,6 +32,7 @@
10
)
+ -- NowPlaying is a resident applet
appletManager:loadApplet("NowPlaying")
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua?rev=2912&root=Jive&r1=2911&r2=2912&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeApplet.lua
Wed Sep 10 12:58:27 2008
@@ -217,6 +217,10 @@
datetime:setHours(hours)
end
+-- wrapper method to allow other applets to get these settings through service
API
+function setupDateTimeSettings(self)
+ return self:getSettings()
+end
--[[
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeMeta.lua?rev=2912&root=Jive&r1=2911&r2=2912&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupDateTime/SetupDateTimeMeta.lua
Wed Sep 10 12:58:27 2008
@@ -56,6 +56,8 @@
-- Init Date Time Object for later use
initDateTimeObject(meta)
+ meta:registerService("setupDateTimeSettings")
+
-- Menu for configuration
jiveMain:addItem(meta:menuItem('appletSetupDateTime',
'advancedSettings', "DATETIME_TITLE", function(applet, ...)
applet:settingsShow(...) end))
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=2912&root=Jive&r1=2911&r2=2912&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 10 12:58:27 2008
@@ -264,12 +264,11 @@
-- _getTimeFormat
-- loads SetupDateTime and returns current setting for date time format
local function _getTimeFormat()
- local SetupDateTime = appletManager:loadApplet("SetupDateTime")
+ local SetupDateTimeSettings =
appletManager:callService("setupDateTimeSettings")
local format = '12'
- if SetupDateTime and SetupDateTime:getSettings()['hours'] then
- format = SetupDateTime:getSettings()['hours']
- end
- appletManager:freeApplet("SetupDateTime")
+ if SetupDateTimeSettings and SetupDateTimeSettings['hours'] then
+ format = SetupDateTimeSettings['hours']
+ end
return format
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
