Author: tom
Date: Mon Nov 3 08:35:18 2008
New Revision: 3260
URL: http://svn.slimdevices.com?rev=3260&root=Jive&view=rev
Log:
Bug 8669:
Description:
Applet load support:
- reverted Allowing early configure, instead move startup sound to register call
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/loadPriority.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/loadPriority.lua
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=3260&root=Jive&r1=3259&r2=3260&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
Mon Nov 3 08:35:18 2008
@@ -53,18 +53,13 @@
-- 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
-
+ appletManager:callService("loadSounds", nil) -- nil is default from
settingsend
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/loadPriority.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/loadPriority.lua?rev=3260&root=Jive&r1=3259&r2=3260&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/loadPriority.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/loadPriority.lua
Mon Nov 3 08:35:18 2008
@@ -1,1 +1,1 @@
-loadPrioritySettings={loadPriority=2,configureAtLoadTime=true}
+loadPriority=2
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua?rev=3260&root=Jive&r1=3259&r2=3260&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua Mon Nov
3 08:35:18 2008
@@ -91,7 +91,6 @@
if not _appletsDb[name] then
- local loadPrioritySettings= _getLoadPrioritySettings(dir.. "/"
.. name)
local newEntry = {
appletName = name,
@@ -111,8 +110,7 @@
metaConfigured = false,
appletLoaded = false,
appletEvaluated = false,
- loadPriority = loadPrioritySettings.loadPriority,
- configureAtLoadTime =
loadPrioritySettings.configureAtLoadTime,
+ loadPriority = _getLoadPriority(dir.. "/" .. name)
}
_appletsDb[name] = newEntry
end
@@ -194,6 +192,18 @@
return resOrErr
end
+
+-- _loadMetas
+-- loads the meta-information of all applets
+local function _loadMetas()
+ log:debug("_loadMetas")
+
+ for name, entry in pairs(getSortedAppletDb(_appletsDb)) do
+ if not entry.metaLoaded then
+ _ploadMeta(entry)
+ end
+ end
+end
-- _evalMeta
@@ -287,26 +297,6 @@
return true
end
--- _loadMetas
--- loads the meta-information of all applets
-local function _loadMetas()
- log:debug("_loadMetas")
-
- for name, entry in pairs(getSortedAppletDb(_appletsDb)) do
- if not entry.metaLoaded then
- _ploadMeta(entry)
- end
- if entry.configureAtLoadTime then
- if not entry.metaRegistered then
- _registerMeta(entry)
- end
- if not entry.metaConfigured then
- _configureMeta(entry)
- end
- end
- end
-end
-
-- _evalMetas
-- evaluates the meta-information of all applets
@@ -594,16 +584,16 @@
end
end
--- _getLoadPrioritySettings
+-- _getLoadPriority
--
-function _getLoadPrioritySettings(appletDir)
-
- log:debug("_getLoadPrioritySettings: ", appletDir)
+function _getLoadPriority(appletDir)
+
+ log:debug("_getLoadPriority: ", appletDir)
local fh = io.open(appletDir .. "/" .. "loadPriority.lua")
if fh == nil then
- -- no loadPriority file, retrun default priority settings
- return {loadPriority=100,configureAtLoadTime=false}
+ -- no loadPriority file, retrun default priority
+ return 100
end
local f, err = load(function() return fh:read() end)
@@ -616,10 +606,8 @@
local env = {}
setfenv(f, env)
f()
- if log:isDebug() then
- debug.dump(env)
- end
- return env.loadPrioritySettings
+
+ return env.loadPriority
end
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/loadPriority.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/loadPriority.lua?rev=3260&root=Jive&r1=3259&r2=3260&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/loadPriority.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/loadPriority.lua
Mon Nov 3 08:35:18 2008
@@ -1,1 +1,1 @@
-loadPrioritySettings={loadPriority=1,configureAtLoadTime=true}
+loadPriority=1
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
