Author: titmuss
Date: Tue Nov 4 03:34:14 2008
New Revision: 3270
URL: http://svn.slimdevices.com?rev=3270&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r3256): bklaas | 2008-11-03 14:19:37 +0000
Bug: n/a
Description: change playmode test order from Stop/Play/Pause to
Play/Pause/Stop. There was an erroneous test failure due to initial player
power state conditions and how Stop reacts under those situations.
[EMAIL PROTECTED] (orig r3257): tom | 2008-11-03 14:26:29 +0000
Bug 8669,9843:
Description:
Applet load support, no stopped screensaver by default
[EMAIL PROTECTED] (orig r3258): tom | 2008-11-03 14:27:45 +0000
Bug 9835:
Description:
Applet load support, no stopped screensaver by default
[EMAIL PROTECTED] (orig r3259): tom | 2008-11-03 16:01:17 +0000
Bug 8669:
Description:
Applet load support:
- Allow early configure
- Load DesktopJive before soundeffect so desktop defautl can be sound effects
off
[EMAIL PROTECTED] (orig r3260): tom | 2008-11-03 16:35:18 +0000
Bug 8669:
Description:
Applet load support:
- reverted Allowing early configure, instead move startup sound to register
call
[EMAIL PROTECTED] (orig r3261): titmuss | 2008-11-03 17:21:37 +0000
Bug: 9191
Description:
Added per window styles and fixed existing applets to use the new api.
[EMAIL PROTECTED] (orig r3262): tom | 2008-11-03 17:59:59 +0000
Bug: 9892
Description:
Ignore modifier keys (numlock capslock, etc) for keyboard shortcuts
[EMAIL PROTECTED] (orig r3263): tom | 2008-11-03 18:21:08 +0000
got rid of debug statements
[EMAIL PROTECTED] (orig r3264): tom | 2008-11-03 19:19:14 +0000
got rid of unused variable
[EMAIL PROTECTED] (orig r3265): bklaas | 2008-11-04 02:28:04 +0000
Bug: n/a
Description: add back noartwork placeholder icon
[EMAIL PROTECTED] (orig r3266): bklaas | 2008-11-04 04:59:46 +0000
Bug: 7271
Description: remove DEFAULT_FIRMWARE_URL that pointed to a 7.0 firmware
do not add Network Update item when there is no firmware url available
register clearUpdateUrl service for wiping the updateUrl table
add call to clearUpdateUrl when playerConnected is nil
[EMAIL PROTECTED] (orig r3267): titmuss | 2008-11-04 09:34:58 +0000
Bug: 9898
Description:
Think faster.
[EMAIL PROTECTED] (orig r3268): titmuss | 2008-11-04 10:44:55 +0000
Bug: N/A
Description:
Add some additional debug for alsa playback.
Don't open the alsa device twice during init.
[EMAIL PROTECTED] (orig r3269): titmuss | 2008-11-04 10:59:20 +0000
Bug: N/A
Descripiton:
Fix syntax error.
Added:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/loadPriority.lua
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/loadPriority.lua
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayMeta.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_style.c
7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Bounce/BounceApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Bounce/BounceMeta.lua
7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Snake/SnakeApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
7.4/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/PlaymodeMacro.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Nov 4 03:34:14 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3253
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3269
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Tue Nov 4 03:34:14 2008
@@ -363,13 +363,6 @@
s.title.back.align = "left"
--]]
---[[
- s.title.icon = {}
- s.title.icon.w = 56
- s.title.icon.h = WH_FILL
- s.title.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork.png")
---]]
-
-- Menu with three basic styles: normal, selected and locked
-- First define the dimesions of the menu
s.menu = {}
@@ -682,7 +675,7 @@
-- connecting/connected popup icon
s.iconConnecting = {}
s.iconConnecting.img = Surface:loadImage(imgpath ..
"Alerts/wifi_connecting.png")
- s.iconConnecting.frameRate = 4
+ s.iconConnecting.frameRate = 8
s.iconConnecting.frameWidth = 161
s.iconConnecting.w = WH_FILL
s.iconConnecting.align = "center"
@@ -1019,7 +1012,7 @@
s.albumitem.icon.w = 56
s.albumitem.icon.h = WH_FILL
s.albumitem.icon.align = "center"
- s.albumitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork.png")
+ s.albumitem.icon.img = Surface:loadImage(imgpath ..
"album_noartwork_56.png")
s.albumitem.icon.border = { 8, 0, 0, 0 }
-- checked albummenu item
@@ -1409,9 +1402,6 @@
s.nowplayingtitle.text.fg = SELECT_COLOR
s.nowplayingtitle.icon = {}
s.nowplayingtitle.icon.hide = 1
--- s.nowplayingtitle.icon.align = "center"
--- s.nowplayingtitle.icon.img = Surface:loadImage(imgpath ..
"menu_nowplaying_noartwork.png")
--- s.nowplayingtitle.icon.padding = { 6, 0, 0, 0 }
-- menus with artwork and song info
@@ -1442,7 +1432,7 @@
s.nowplayingitem.icon.w = 156
s.nowplayingitem.icon.h = 156
s.nowplayingitem.icon.align = "left"
- s.nowplayingitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork.png")
+ s.nowplayingitem.icon.img = Surface:loadImage(imgpath ..
"album_noartwork_56.png")
s.nowplayingitem.icon.padding = { 5, 0, 0, 0 }
@@ -1483,7 +1473,7 @@
s.albumcurrent.icon.w = 56
s.albumcurrent.icon.h = WH_FILL
s.albumcurrent.icon.align = "center"
- s.albumcurrent.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork.png")
+ s.albumcurrent.icon.img = Surface:loadImage(imgpath ..
"album_noartwork_56.png")
s.albumcurrent.icon.border = { 8, 0, 0, 0 }
s.albumcurrent.play = {}
s.albumcurrent.play.img = Surface:loadImage(imgpath ..
"Icons/icon_nowplaying_indicator_w.png")
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrApplet.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrApplet.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrApplet.lua
Tue Nov 4 03:34:14 2008
@@ -479,6 +479,13 @@
function _window(self, ...)
local window = Window("flickr")
+ window:setSkin({
+ flickr = {
+ layout = Window.noLayout,
+ font = Font:load("fonts/FreeSans.ttf", 10)
+ }
+ })
+
-- black window background
window:setShowFrameworkWidgets(false)
@@ -879,15 +886,6 @@
end
--- applet skin
-function skin(self, s)
- s.flickr = {
- layout = Window.noLayout,
- font = Font:load("fonts/FreeSans.ttf", 10)
- }
-end
-
-
--[[
=head1 LICENSE
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/applets/Flickr/FlickrMeta.lua
Tue Nov 4 03:34:14 2008
@@ -46,10 +46,6 @@
function registerApplet(self)
-
- -- load our skin
- jiveMain:loadSkin("Flickr", "skin")
-
end
function configureApplet(self)
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayApplet.lua
Tue Nov 4 03:34:14 2008
@@ -105,6 +105,15 @@
local window = Window("window", self:string("MACRO_AUTOSTART"))
local menu = SimpleMenu("menu", items)
local help = Textarea("textarea", "")
+
+ window:setSkin({
+ macroPass = {
+ img = Surface:loadImage("applets/MacroPlay/pass.png"),
+ },
+ macroFail = {
+ img = Surface:loadImage("applets/MacroPlay/fail.png"),
+ },
+ })
window:addWidget(help)
window:addWidget(menu)
@@ -519,16 +528,6 @@
end
-function skin(self, s)
- s.macroPass = {
- img = Surface:loadImage("applets/MacroPlay/pass.png")
- }
- s.macroFail = {
- img = Surface:loadImage("applets/MacroPlay/fail.png")
- }
-end
-
-
--[[
=head1 LICENSE
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayMeta.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayMeta.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayMeta.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/MacroPlay/MacroPlayMeta.lua
Tue Nov 4 03:34:14 2008
@@ -53,7 +53,5 @@
-- menu item to start
jiveMain:addItem(meta:menuItem('macroPlay', 'extras', 'MACRO_PLAY',
function(applet, ...) applet:settingsShow(...) end))
-
- jiveMain:loadSkin("MacroPlay", "skin")
end
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
Tue Nov 4 03:34:14 2008
@@ -50,7 +50,7 @@
function init(self, ...)
self.screensavers = {}
self.screensaverSettings = {}
- self:addScreenSaver(self:string("SCREENSAVER_NONE"), nil, nil, _, _,
100)
+ self:addScreenSaver(self:string("SCREENSAVER_NONE"), false, false, _,
_, 100)
self.timeout = self:getSettings()["timeout"]
@@ -126,7 +126,7 @@
end
local screensaver = self.screensavers[the_screensaver]
- if screensaver == nil or screensaver.applet == nil then
+ if not screensaver or not screensaver.applet then
-- no screensaver, do nothing
return
end
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestApplet.lua
Tue Nov 4 03:34:14 2008
@@ -66,6 +66,21 @@
end
self.window = Window("nettest", self:string('SETUPNETTEST_TESTING'))
+ self.window:setSkin({
+ nettest = {
+ icon = {
+ padding = { 20, 3, 20, 1 }
+ },
+ graphtitle = {
+ padding = { 20, 7, 0, 0 },
+ fg = { 0xE7, 0xE7, 0xE7 }
+ },
+ graphaxis = {
+ padding = { 20, 1, 0, 0 },
+ fg = { 0xE7, 0xE7, 0xE7 }
+ }
+ }
+ })
self:tieAndShowWindow(self.window)
@@ -154,7 +169,7 @@
function showHelpWindow(self)
- local window = Window("nettest", self:string('SETUPNETTEST_HELPTITLE'))
+ local window = Window("window", self:string('SETUPNETTEST_HELPTITLE'))
local help = Textarea("textarea", self:string('SETUPNETTEST_HELP'))
window:addWidget(help)
@@ -265,23 +280,6 @@
end
-function skin(self, s)
- s.nettest = {
- icon = {
- padding = { 20, 3, 20, 1 }
- },
- graphtitle = {
- padding = { 20, 7, 0, 0 },
- fg = { 0xE7, 0xE7, 0xE7 }
- },
- graphaxis = {
- padding = { 20, 1, 0, 0 },
- fg = { 0xE7, 0xE7, 0xE7 }
- }
- }
-end
-
-
function free(self)
self.timer:stop()
self:stopTest()
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupNetTest/SetupNetTestMeta.lua
Tue Nov 4 03:34:14 2008
@@ -33,8 +33,6 @@
-- add the menu item to homeMenu but 'hidden', or else the
playerCurrent notification method below quits happening (not sure why this is
the case, but it is)
-- item will be made visible by moving it to advancedSettings in the
playerCurrent notification below
jiveMain:addItem(meta.menu)
-
- jiveMain:loadSkin("SetupNetTest", "skin")
end
-- hide menu item when player goes away
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsMeta.lua
Tue Nov 4 03:34:14 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
Added:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/loadPriority.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/loadPriority.lua?rev=3270&root=Jive&view=auto
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/loadPriority.lua
(added)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/loadPriority.lua
Tue Nov 4 03:34:14 2008
@@ -1,0 +1,1 @@
+loadPriority=2
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Tue Nov 4 03:34:14 2008
@@ -1948,10 +1948,20 @@
end
_playerKeyHandler = Framework:addListener(
- EVENT_KEY_DOWN | EVENT_KEY_PRESS | EVENT_KEY_HOLD,
+ EVENT_KEY_DOWN | EVENT_KEY_PRESS | EVENT_KEY_HOLD |
EVENT_CHAR_PRESS,
function(event)
local type = event:getType()
+ if type == EVENT_CHAR_PRESS then
+ local keyboardEntry =
string.char(event:getUnicode())
+ if keyboardEntry == "/" then
+ _goSearch()
+ return EVENT_CONSUME
+ else
+ return EVENT_UNUSED
+ end
+ end
+
local actionName =
_keycodeActionName[event:getKeycode()]
if not actionName then
return EVENT_UNUSED
@@ -1986,6 +1996,13 @@
_playerKeyHandler = false
end
+function _goSearch()
+ --bring up music library search
+ if jiveMain:getMenuTable().myMusicSearch then
+ Framework:playSound("JUMP")
+ jiveMain:getMenuTable().myMusicSearch.callback()
+ end
+end
--==============================================================================
-- SlimBrowserApplet public methods
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/AppletManager.lua Tue Nov
4 03:34:14 2008
@@ -32,6 +32,7 @@
local log = require("jive.utils.log").logger("applets.misc")
local locale = require("jive.utils.locale")
local dumper = require("jive.utils.dumper")
+local table = require("jive.utils.table")
local JIVE_VERSION = jive.JIVE_VERSION
local EVENT_ACTION = jive.ui.EVENT_ACTION
@@ -56,6 +57,9 @@
-- applet services
local _services = {}
+
+local _defaultSettingsByAppletName = {}
+--work in progress-- local _overrideSettingsByAppletName = {}
-- allowed applets, can be used for debugging to limit applets loaded
--[[
@@ -106,6 +110,7 @@
metaConfigured = false,
appletLoaded = false,
appletEvaluated = false,
+ loadPriority = _getLoadPriority(dir.. "/" .. name)
}
_appletsDb[name] = newEntry
end
@@ -193,7 +198,7 @@
local function _loadMetas()
log:debug("_loadMetas")
- for name, entry in pairs(_appletsDb) do
+ for name, entry in pairs(getSortedAppletDb(_appletsDb)) do
if not entry.metaLoaded then
_ploadMeta(entry)
end
@@ -223,10 +228,40 @@
if not entry.settings then
entry.settings = obj:defaultSettings()
+
+ --apply global defaults
+ local globalDefaultSettings =
_getDefaultSettings(entry.appletName)
+
+ if globalDefaultSettings then
+ if not entry.settings then
+ entry.settings = {}
+ end
+
+ for settingName, settingValue in
pairs(globalDefaultSettings) do
+ --global defaults override applet default
settings
+ log:error("Setting global default",
settingName, "=", settingValue)
+ entry.settings[settingName] = settingValue
+ end
+ end
+
else
entry.settings = obj:upgradeSettings(entry.settings)
end
+ --apply global overrides
+-- local overrideSettings = _getOverrideSettings(entry.appletName)
+--
+-- if defaultSettings then
+-- if not entry.settings then
+-- entry.settings = {}
+-- end
+--
+-- for settingName, settingValue in pairs(defaultSettings) do
+-- --global defaults override applet default settings
+-- entry.settings[settingName] = settingValue
+-- end
+-- end
+
obj._entry = entry
obj._settings = entry.settings
obj._stringsTable = entry.stringsTable
@@ -268,11 +303,11 @@
local function _evalMetas()
log:debug("_evalMetas")
- for name, entry in pairs(_appletsDb) do
+ for name, entry in pairs(getSortedAppletDb(_appletsDb)) do
_pevalMeta(entry)
end
- for name, entry in pairs(_appletsDb) do
+ for name, entry in pairs(getSortedAppletDb(_appletsDb)) do
if entry.metaLoaded and not entry.metaConfigured then
local ok, resOrErr = pcall(_configureMeta, entry)
if not ok then
@@ -293,7 +328,7 @@
-- trash them , we would need to store them here (to reload them if the
applet ever runs)
-- because the meta might have changed them.
- for name, entry in pairs(_appletsDb) do
+ for name, entry in pairs(getSortedAppletDb(_appletsDb)) do
entry.metaObj = nil
-- trash the meta in all cases, it's done it's job
@@ -311,19 +346,26 @@
log:debug("AppletManager:loadApplets")
_findApplets()
-
- -- load the sound effects applet first so the startup
- -- sound is played without delay.
- -- FIXME make the startup order of applet configurable
- local soundEffectsEntry = _appletsDb["SetupSoundEffects"]
- if soundEffectsEntry then
- _loadMeta(soundEffectsEntry)
- _registerMeta(soundEffectsEntry)
- _configureMeta(soundEffectsEntry)
- end
-
_loadMetas()
_evalMetas()
+end
+
+
+function getSortedAppletDb(hash)
+ local sortedTable = {};
+ for k, value in pairs(hash) do
+ table.insert(sortedTable, value);
+ end
+ table.sort(sortedTable, _comparatorLoadPriorityThenAlphabetic)
+ return sortedTable;
+end
+
+function _comparatorLoadPriorityThenAlphabetic(a, b)
+ if (a.loadPriority ~= b.loadPriority) then
+ return a.loadPriority < b.loadPriority
+ else
+ return a.appletName < b.appletName
+ end
end
@@ -542,6 +584,33 @@
end
end
+-- _getLoadPriority
+--
+function _getLoadPriority(appletDir)
+
+ log:debug("_getLoadPriority: ", appletDir)
+
+ local fh = io.open(appletDir .. "/" .. "loadPriority.lua")
+ if fh == nil then
+ -- no loadPriority file, retrun default priority
+ return 100
+ end
+
+ local f, err = load(function() return fh:read() end)
+ fh:close()
+
+ if not f then
+ log:error("Error reading ", appletDir, " loadPriority: ", err)
+ else
+ -- evalulate in a sandbox
+ local env = {}
+ setfenv(f, env)
+ f()
+
+ return env.loadPriority
+ end
+end
+
-- _storeSettings
--
@@ -609,6 +678,25 @@
end
+function _getDefaultSettings(appletName)
+ return _defaultSettingsByAppletName[appletName]
+end
+
+function _setDefaultSettings(appletName, settings)
+ if not _defaultSettingsByAppletName[appletName] then
+ _defaultSettingsByAppletName[appletName] = {}
+ end
+ _defaultSettingsByAppletName[appletName] = settings
+end
+
+function addDefaultSetting(self, appletName, settingName, settingValue)
+ if not _defaultSettingsByAppletName[appletName] then
+ _defaultSettingsByAppletName[appletName] = {}
+ end
+ _defaultSettingsByAppletName[appletName][settingName] = settingValue
+end
+
+
function registerService(self, appletName, service)
log:debug("registerService appletName=", appletName, " service=",
service)
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Window.lua Tue Nov 4
03:34:14 2008
@@ -799,6 +799,16 @@
end
+function setSkin(self, skin)
+ self.skin = skin
+end
+
+
+function getSkin(self)
+ return self.skin
+end
+
+
function __tostring(self)
if self.title then
return "Window(" .. tostring(self.title) .. ")"
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c Tue
Nov 4 03:34:14 2008
@@ -170,12 +170,16 @@
}
-static int pcm_open() {
+static int pcm_open(u32_t sample_rate) {
int err, dir;
snd_pcm_uframes_t size;
#define BUFFER_SIZE 8192 /*(8291 / 4)*/
#define PERIOD_SIZE (BUFFER_SIZE / 4) /*(BUFFER_SIZE / 8)*/
+ if (handle && sample_rate == pcm_sample_rate) {
+ return 0;
+ }
+
/* Close existing pcm (if any) */
if (handle) {
if ((err = snd_pcm_drain(handle)) < 0) {
@@ -231,7 +235,7 @@
}
/* set the stream rate */
- if ((err = snd_pcm_hw_params_set_rate_near(handle, hwparams,
&new_sample_rate, 0)) < 0) {
+ if ((err = snd_pcm_hw_params_set_rate_near(handle, hwparams,
&sample_rate, 0)) < 0) {
DEBUG_ERROR("Rate not available: %s", snd_strerror(err));
return err;
}
@@ -261,8 +265,11 @@
return err;
}
- pcm_sample_rate = new_sample_rate;
- new_sample_rate = 0;
+#ifdef RUNTIME_DEBUG
+ snd_pcm_dump(handle, output);
+#endif
+
+ pcm_sample_rate = sample_rate;
return 0;
}
@@ -300,16 +307,16 @@
DEBUG_TRACE("audio_thread_execute");
- new_sample_rate = 44100;
-
while (1) {
fifo_lock(&decode_fifo);
if (new_sample_rate) {
- if ((err = pcm_open()) < 0) {
+ if ((err = pcm_open(new_sample_rate)) < 0) {
DEBUG_ERROR("Open failed: %s",
snd_strerror(err));
return (void *)-1;
}
+
+ new_sample_rate = 0;
first = 1;
}
@@ -445,7 +452,7 @@
DEBUG_TRACE("Playback device: %s\n", device);
- if (pcm_open() < 0) {
+ if (pcm_open(44100) < 0) {
return 0;
}
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c Tue Nov 4
03:34:14 2008
@@ -1093,6 +1093,7 @@
case SDL_KEYUP: {
struct jive_keymap *entry = keymap;
+
while (entry->keysym != SDLK_UNKNOWN) {
if (entry->keysym == event->key.keysym.sym) {
break;
@@ -1102,8 +1103,7 @@
if (entry->keysym == SDLK_UNKNOWN) {
// handle regular character keys ('a', 't', etc..)
- SDLMod mod = event->key.keysym.mod;
- if (event->type == SDL_KEYDOWN &&
(event->key.keysym.unicode != 0) && (mod == KMOD_NONE || mod == KMOD_LSHIFT ||
mod == KMOD_RSHIFT)) {
+ if (event->type == SDL_KEYDOWN &&
event->key.keysym.unicode != 0) {
JiveEvent textEvent;
memset(&textEvent, 0, sizeof(JiveEvent));
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_style.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_style.c?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_style.c (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_style.c Tue Nov 4
03:34:14 2008
@@ -50,20 +50,22 @@
static int jiveL_style_find_value(lua_State *L) {
/* stack is:
* 1: widget
- * 2: path
- * 3: key
+ * 2: skin
+ * 3: path
+ * 4: key
*/
- const char *path = lua_tostring(L, 2);
- const char *key = lua_tostring(L, 3);
+ const char *path = lua_tostring(L, 3);
+ const char *key = lua_tostring(L, 4);
char *ptr = (char *) path;
while (ptr) {
char *tmp = strdup(ptr);
- get_jive_ui_style(L);
+ lua_pushvalue(L, 2);
if (search_path(L, 1, tmp, key) && !lua_isnil(L, -1)) {
free(tmp);
+
lua_remove(L, -2);
return 1;
}
@@ -79,6 +81,24 @@
lua_pushnil(L);
return 1;
}
+
+#if RUNTIME_DEBUG
+static void debug_style(lua_State *L, const char *path, const char *key) {
+ lua_getglobal(L, "tostring");
+ lua_pushvalue(L, -2);
+ lua_call(L, 1, 1);
+
+ lua_getglobal(L, "tostring");
+ lua_pushvalue(L, 1);
+ lua_call(L, 1, 1);
+
+ DEBUG_TRACE("style: [%s] %s : %s = %s", lua_tostring(L, -1), path, key,
lua_tostring(L, -2));
+ lua_pop(L, 2);
+}
+#else
+static void debug_style(lua_State *L, const char *path, const char *key) {
+}
+#endif
static int STYLE_VALUE_NIL;
@@ -113,7 +133,6 @@
pathidx = lua_gettop(L);
path = lua_tostring(L, -1);
-
/* check cache */
lua_getfield(L, LUA_REGISTRYINDEX, "jiveStyleCache");
if (lua_isnil(L, -1)) {
@@ -143,9 +162,10 @@
// find value
lua_pushcfunction(L, jiveL_style_find_value);
lua_pushvalue(L, 1); // widget
+ get_jive_ui_style(L); // skin
lua_pushvalue(L, pathidx);
lua_pushvalue(L, 2); // key
- lua_call(L, 3, 1);
+ lua_call(L, 4, 1);
if (lua_isnil(L, -1)) {
/* use a marker for nil */
@@ -156,14 +176,7 @@
}
lua_setfield(L, -3, key);
-#if RUNTIME_DEBUG
- lua_getglobal(L, "tostring");
- lua_pushvalue(L, -2);
- lua_call(L, 1, 1);
-
- DEBUG_TRACE("style: %s : %s = %s", path, key, lua_tostring(L,
-1));
- lua_pop(L, 1);
-#endif
+ debug_style(L, path, key);
}
/* nil marker */
@@ -174,13 +187,40 @@
}
lua_pop(L, 1);
+ if (!lua_isnil(L, -1)) {
+ /* return skin value */
+ return 1;
+ }
+
+ /* per widget skin */
+ if (jive_getmethod(L, 1, "getWindow")) {
+ lua_pushvalue(L, 1);
+ lua_call(L, 1, 1);
+
+ if (!lua_isnil(L, -1)) {
+ lua_getfield(L, -1, "skin");
+ if (!lua_isnil(L, -1)) {
+ lua_pushcfunction(L, jiveL_style_find_value);
+ lua_pushvalue(L, 1); // widget
+ lua_pushvalue(L, -3); // skin
+ lua_pushvalue(L, pathidx);
+ lua_pushvalue(L, 2); // key
+ lua_call(L, 4, 1);
+
+ if (!lua_isnil(L, -1)) {
+ debug_style(L, path, key);
+
+ return 1;
+ }
+ lua_pop(L, 1);
+ }
+ }
+ lua_pop(L, 1);
+ }
+
/* default value */
- if (lua_isnil(L, -1)) {
-
- lua_pop(L, 1);
- lua_pushvalue(L, 3);
-
- }
+ lua_pop(L, 1);
+ lua_pushvalue(L, 3);
return 1;
}
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Bounce/BounceApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Bounce/BounceApplet.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Bounce/BounceApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Bounce/BounceApplet.lua
Tue Nov 4 03:34:14 2008
@@ -98,6 +98,12 @@
local window = Window("bounce")
local w, h = Framework:getScreenSize()
+ window:setSkin({
+ bounce = {
+ layout = Window.noLayout,
+ }
+ })
+
self.sprits = {}
-- squeezebox string
@@ -147,13 +153,6 @@
end
--- applet skin
-function skin(self, s)
- s.bounce = {}
- s.bounce.layout = Window.noLayout
-end
-
-
--[[
=head1 LICENSE
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Bounce/BounceMeta.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Bounce/BounceMeta.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Bounce/BounceMeta.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Bounce/BounceMeta.lua
Tue Nov 4 03:34:14 2008
@@ -34,8 +34,6 @@
end
function registerApplet(self)
- -- load our skin
- jiveMain:loadSkin("Bounce", "skin")
end
function configureApplet(self)
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Snake/SnakeApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Snake/SnakeApplet.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Snake/SnakeApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_contrib/share/applets/Snake/SnakeApplet.lua
Tue Nov 4 03:34:14 2008
@@ -163,10 +163,6 @@
-- draw red dots
self:drawList(red_dots, 0xFF0000FF)
self.bg:reDraw()
-end
-
-function skin(self, s)
- s.snake.layout = Window.noLayout
end
function gameOver()
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
Tue Nov 4 03:34:14 2008
@@ -90,6 +90,8 @@
-- set uuid
jnt:setUUID(settings.uuid, settings.mac)
+ appletManager:addDefaultSetting("ScreenSavers", "whenStopped",
"false:false")
+
jiveMain:setDefaultSkin("FullscreenSkin")
end
Added:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/loadPriority.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/loadPriority.lua?rev=3270&root=Jive&view=auto
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/loadPriority.lua
(added)
+++
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/loadPriority.lua
Tue Nov 4 03:34:14 2008
@@ -1,0 +1,1 @@
+loadPriority=1
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Tue Nov 4 03:34:14 2008
@@ -55,8 +55,6 @@
local firmwareupgradeTitleStyle = 'settingstitle'
-local DEFAULT_FIRMWARE_URL =
"http://www.slimdevices.com/update/firmware/7.0/jive.bin";
-
local SDCARD_PATH = "/mnt/mmc/"
module(..., Framework.constants)
@@ -94,22 +92,25 @@
function _makeUpgradeItems(self, window, menu, optional, url, urlHelp)
local help = Textarea("help", "")
- local version = self:_firmwareVersion(url)
- menu:addItem({
- text = self:string("BEGIN_UPDATE"),
- sound = "WINDOWSHOW",
- callback = function()
- self.url = url
- self:_upgrade()
- end,
- focusGained = function()
- if _versionCompare(JIVE_VERSION, version) <= 0 then
- help:setValue(self:string(urlHelp or
"UPDATE_BEGIN_REINSTALL", version or "?"))
- else
- help:setValue(self:string(urlHelp or
"UPDATE_BEGIN_UPGRADE", version or "?"))
+ if url then
+ local version = self:_firmwareVersion(url)
+ local networkUpdateItem = {
+ text = self:string("BEGIN_UPDATE"),
+ sound = "WINDOWSHOW",
+ callback = function()
+ self.url = url
+ self:_upgrade()
+ end,
+ focusGained = function()
+ if _versionCompare(JIVE_VERSION, version) <= 0
then
+ help:setValue(self:string(urlHelp or
"UPDATE_BEGIN_REINSTALL", version or "?"))
+ else
+ help:setValue(self:string(urlHelp or
"UPDATE_BEGIN_UPGRADE", version or "?"))
+ end
end
- end
- })
+ }
+ menu:addItem(networkUpdateItem)
+ end
for entry in lfs.dir(SDCARD_PATH) do
local fileurl = "file:" .. SDCARD_PATH .. entry
@@ -148,6 +149,10 @@
window:addWidget(menu)
end
+-- when the server disconnects we clear the upgrade Url
+function clearUpgradeUrl(self)
+ upgradeUrl = { false }
+end
function forceUpgrade(self, optional, upgUrl, urlHelp)
local url = upgUrl
@@ -155,7 +160,7 @@
url = upgradeUrl[1]
end
if not url then
- url = DEFAULT_FIRMWARE_URL
+ return
end
local window = Window("window", self:string("UPDATE"),
firmwareupgradeTitleStyle)
@@ -182,7 +187,6 @@
return window
end
-
function settingsShow(self)
local window = Window("window", self:string("UPDATE"),
firmwareupgradeTitleStyle)
@@ -190,7 +194,7 @@
local url = upgradeUrl[1]
if not url then
- url = DEFAULT_FIRMWARE_URL
+ url = false
end
self:_makeUpgradeItems(window, menu, true, url)
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Tue Nov 4 03:34:14 2008
@@ -31,6 +31,7 @@
jiveMain:addItem(meta:menuItem('appletSetupFirmwareUpgrade',
'advancedSettings', "UPDATE", function(applet) applet:settingsShow() end))
meta:registerService("forceUpgrade")
+ meta:registerService("clearUpgradeUrl")
-- check for firmware upgrades when we connect to a new player
-- we don't want the firmware upgrade applets always loaded so
-- do this in the meta class
@@ -60,6 +61,7 @@
meta.player = player
if not player then
+ appletManager:callService("clearUpgradeUrl")
return
end
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/PlaymodeMacro.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/PlaymodeMacro.lua?rev=3270&root=Jive&r1=3269&r2=3270&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/PlaymodeMacro.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_jive/test/smoke/PlaymodeMacro.lua Tue
Nov 4 03:34:14 2008
@@ -9,13 +9,6 @@
-- key go into Now Playing
macroEvent(1000, EVENT_KEY_PRESS, KEY_GO)
-
-
--- stop (hold pause), wait until after show briefly
-macroEvent(5000, EVENT_KEY_HOLD, KEY_PAUSE)
-if not macroScreenshot(1000, "PlaymodeStop") then
- return macroFail("Playmode Stop")
-end
-- play, wait until after show briefly
macroEvent(5000, EVENT_KEY_PRESS, KEY_PLAY)
@@ -29,4 +22,11 @@
return macroFail("Playmode Pause")
end
+-- stop (hold pause), wait until after show briefly
+macroEvent(5000, EVENT_KEY_HOLD, KEY_PAUSE)
+if not macroScreenshot(1000, "PlaymodeStop") then
+ return macroFail("Playmode Stop")
+end
+
+
macroPass("Playmode")
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
