Author: bklaas
Date: Thu Sep 25 08:57:06 2008
New Revision: 2970
URL: http://svn.slimdevices.com?rev=2970&root=Jive&view=rev
Log:
Bug: 9526, 9576, 7873
Description: utilize 2-stage applet registration with registerApplet() and
configureApplet(),
moving any callService() calls to configureApplet() so all services should be
already registered before calling
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Quit/QuitMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeMeta.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenMeta.lua?rev=2970&root=Jive&r1=2969&r2=2970&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenMeta.lua
Thu Sep 25 08:57:06 2008
@@ -40,6 +40,9 @@
function registerApplet(self)
+end
+
+function configureApplet(self)
-- BlankScreen implements a screensaver
appletManager:callService("addScreenSaver",
self:string("SCREENSAVER_BLANKSCREEN"),
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=2970&root=Jive&r1=2969&r2=2970&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
Thu Sep 25 08:57:06 2008
@@ -45,6 +45,10 @@
function registerApplet(meta)
meta:registerService("selectMusicSource")
+
+end
+
+function configureApplet(meta)
-- set the poll list for discovery of slimservers based on our settings
if appletManager:hasService("setPollList") then
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockMeta.lua?rev=2970&root=Jive&r1=2969&r2=2970&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockMeta.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Clock/ClockMeta.lua Thu
Sep 25 08:57:06 2008
@@ -23,6 +23,10 @@
end
function registerApplet(self)
+
+end
+
+function configureApplet(self)
appletManager:callService("addScreenSaver",
self:string("SCREENSAVER_CLOCK_STYLE_ANALOG"),
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua?rev=2970&root=Jive&r1=2969&r2=2970&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua
Thu Sep 25 08:57:06 2008
@@ -47,11 +47,16 @@
function registerApplet(self)
+ -- load our skin
+ jiveMain:loadSkin("Flickr", "skin")
+
+end
+
+function configureApplet(self)
+
appletManager:callService("addScreenSaver",
self:string("SCREENSAVER_FLICKR"), "Flickr",
"openScreensaver", self:string("SCREENSAVER_FLICKR_SETTINGS"), "openSettings",
90)
- -- load our skin
- jiveMain:loadSkin("Flickr", "skin")
end
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=2970&root=Jive&r1=2969&r2=2970&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
Thu Sep 25 08:57:06 2008
@@ -24,6 +24,11 @@
self:registerService('goNowPlaying')
+end
+
+
+function configureApplet(self)
+
appletManager:callService("addScreenSaver",
self:string("SCREENSAVER_NOWPLAYING"),
"NowPlaying",
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua?rev=2970&root=Jive&r1=2969&r2=2970&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
Thu Sep 25 08:57:06 2008
@@ -50,16 +50,21 @@
-- load sounds
meta:registerService("loadSounds")
+ -- add a menu to load us
+ jiveMain:addItem(meta:menuItem('appletSetupSoundEffects',
'advancedSettings', "SOUND_EFFECTS", function(applet, ...)
applet:settingsShow(...) end))
+
+end
+
+function configureApplet(self)
+
-- The startup sound needs to be played with the minimum
-- delay, load and play it first
appletManager:callService("loadSounds", "STARTUP")
Framework:playSound("STARTUP")
-
+
-- Load all other sounds
appletManager:callService("loadSounds", nil) -- nil is default from
settings
- -- add a menu to load us
- jiveMain:addItem(meta:menuItem('appletSetupSoundEffects',
'advancedSettings', "SOUND_EFFECTS", function(applet, ...)
applet:settingsShow(...) end))
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperMeta.lua?rev=2970&root=Jive&r1=2969&r2=2970&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperMeta.lua
Thu Sep 25 08:57:06 2008
@@ -43,12 +43,15 @@
function registerApplet(meta)
meta:registerService("showBackground")
meta:registerService("setBackground")
- -- load default wallpaper before connecting to a player (nil will load
default)
- appletManager:callService("setBackground", nil)
-
-- add a menu item for configuration
jiveMain:addItem(meta:menuItem('appletSetupWallpaper',
'screenSettings', 'WALLPAPER', function(applet, ...) applet:settingsShow(...)
end))
+end
+
+function configureApplet(meta)
+
+ -- load default wallpaper before connecting to a player (nil will load
default)
+ appletManager:callService("setBackground", nil)
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Quit/QuitMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Quit/QuitMeta.lua?rev=2970&root=Jive&r1=2969&r2=2970&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Quit/QuitMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/Quit/QuitMeta.lua
Thu Sep 25 08:57:06 2008
@@ -37,6 +37,9 @@
function registerApplet(self)
+end
+
+function configureApplet(self)
-- add ourselves to the end of the main menu
jiveMain:addItem({
id = 'appletQuit',
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeMeta.lua?rev=2970&root=Jive&r1=2969&r2=2970&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/SetupWelcome/SetupWelcomeMeta.lua
Thu Sep 25 08:57:06 2008
@@ -41,6 +41,9 @@
function registerApplet(meta)
meta:registerService("step1")
+end
+
+function configureApplet(meta)
if not meta:getSettings().setupDone then
appletManager:callService("step1")
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeMeta.lua?rev=2970&root=Jive&r1=2969&r2=2970&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupWelcome/SetupWelcomeMeta.lua
Thu Sep 25 08:57:06 2008
@@ -42,6 +42,9 @@
function registerApplet(meta)
meta:registerService("step1")
+end
+
+function configureApplet(meta)
if not meta:getSettings().setupDone then
appletManager:callService("step1")
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
