Author: tom
Date: Mon Nov 3 08:01:17 2008
New Revision: 3259
URL: http://svn.slimdevices.com?rev=3259&root=Jive&view=rev
Log:
Bug 8669:
Description:
Applet load support:
- Allow early configure
- Load DesktopJive before soundeffect so desktop defautl can be sound effects
off
Modified:
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/loadPriority.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/loadPriority.lua?rev=3259&root=Jive&r1=3258&r2=3259&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:01:17 2008
@@ -1,1 +1,1 @@
-loadPriority=1
+loadPrioritySettings={loadPriority=2,configureAtLoadTime=true}
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=3259&root=Jive&r1=3258&r2=3259&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:01:17 2008
@@ -91,6 +91,7 @@
if not _appletsDb[name] then
+ local loadPrioritySettings= _getLoadPrioritySettings(dir.. "/"
.. name)
local newEntry = {
appletName = name,
@@ -110,7 +111,8 @@
metaConfigured = false,
appletLoaded = false,
appletEvaluated = false,
- loadPriority = _getLoadPriority(dir.. "/" .. name)
+ loadPriority = loadPrioritySettings.loadPriority,
+ configureAtLoadTime =
loadPrioritySettings.configureAtLoadTime,
}
_appletsDb[name] = newEntry
end
@@ -192,18 +194,6 @@
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
@@ -297,6 +287,26 @@
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
@@ -584,16 +594,16 @@
end
end
--- _getLoadPriority
+-- _getLoadPrioritySettings
--
-function _getLoadPriority(appletDir)
-
- log:debug("_getLoadPriority: ", appletDir)
+function _getLoadPrioritySettings(appletDir)
+
+ log:debug("_getLoadPrioritySettings: ", appletDir)
local fh = io.open(appletDir .. "/" .. "loadPriority.lua")
if fh == nil then
- -- no loadPriority file, retrun default priority
- return 100
+ -- no loadPriority file, retrun default priority settings
+ return {loadPriority=100,configureAtLoadTime=false}
end
local f, err = load(function() return fh:read() end)
@@ -606,8 +616,10 @@
local env = {}
setfenv(f, env)
f()
-
- return env.loadPriority
+ if log:isDebug() then
+ debug.dump(env)
+ end
+ return env.loadPrioritySettings
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=3259&root=Jive&r1=3258&r2=3259&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:01:17 2008
@@ -1,1 +1,1 @@
-loadPriority=2
+loadPrioritySettings={loadPriority=1,configureAtLoadTime=true}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
