Author: titmuss
Date: Tue Nov 11 05:50:42 2008
New Revision: 3322
URL: http://svn.slimdevices.com?rev=3322&root=Jive&view=rev
Log:
Bug: 9958
Description:
Load the SqueezeboxJive applet with priority, this fixes a bug where the time
is not correctly set on jive after the battery has been
removed.
Bug: N/A
Description:
Fix sort order for the audio playback menu.
Bug: 6685
Description:
Reduce the watchdog timer to 10 seconds.
Added:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/loadPriority.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/PlaybackMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/PlaybackMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/PlaybackMeta.lua?rev=3322&root=Jive&r1=3321&r2=3322&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/PlaybackMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/Playback/PlaybackMeta.lua
Tue Nov 11 05:50:42 2008
@@ -41,7 +41,7 @@
-- this allows us to share state with the applet
meta.state = {}
- jiveMain:addItem(meta:menuItem('audioPlayback', 'advancedSettings',
"AUDIO_PLAYBACK", function(applet, ...) applet:settingsShow(meta.state) end, 1))
+ jiveMain:addItem(meta:menuItem('audioPlayback', 'advancedSettings',
"AUDIO_PLAYBACK", function(applet, ...) applet:settingsShow(meta.state) end))
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=3322&root=Jive&r1=3321&r2=3322&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Tue Nov 11 05:50:42 2008
@@ -116,8 +116,8 @@
-- watchdog timer
self.watchdog = Watchdog:open()
if self.watchdog then
- self.watchdog:setTimeout(30) -- 30 seconds
- local timer = Timer(10000, -- 10 seconds
+ self.watchdog:setTimeout(10) -- 10 seconds
+ local timer = Timer(2000, -- 2 seconds
function()
self.watchdog:keepAlive()
end)
@@ -127,14 +127,14 @@
end
-- sync clock to hw clock every 10 minutes
- local clockSyncTimer = Timer(600000, -- 10 minutes
- function()
- local systemTime = os.date()
- log:info('syncing system clock
to hw clock: ', systemTime)
- os.execute("hwclock -s")
- systemTime = os.date()
- log:info('system clock now
synced to hw clock: ', systemTime)
- end)
+ clockSyncTimer = Timer(600000, -- 10 minutes
+ function()
+ local systemTime = os.date()
+ log:info('syncing system clock to hw clock: ',
systemTime)
+ os.execute("hwclock -s")
+ systemTime = os.date()
+ log:info('system clock now synced to hw clock: ',
systemTime)
+ end)
clockSyncTimer:start()
-- register wakeup function
Added:
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/loadPriority.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/loadPriority.lua?rev=3322&root=Jive&view=auto
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/loadPriority.lua
(added)
+++
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/loadPriority.lua
Tue Nov 11 05:50:42 2008
@@ -1,0 +1,1 @@
+loadPriority=1
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
