Author: bklaas
Date: Tue Jun 15 09:02:16 2010
New Revision: 8854
URL: http://svn.slimdevices.com/jive?rev=8854&view=rev
Log:
Fixed Bug: 15658
Description: add System:hasBatteryCapability() method for returning whether a
device is capable of having a battery
Baby and Jive are battery capable, Desktop and Fab4 are not
Add code to SetupSoundEffects to not present option for Battery Charging in
sound effects menu when not applicable
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua
7.5/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
7.5/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Modified:
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua?rev=8854&r1=8853&r2=8854&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
Tue Jun 15 09:02:16 2010
@@ -131,44 +131,45 @@
-- add sounds
local effectsEnabled = false
for k,v in pairs(groups) do
- local soundEnabled = Framework:isSoundEnabled(v[1])
- effectsEnabled = effectsEnabled or soundEnabled
-
- local button = Checkbox(
- "checkbox",
- function(obj, isSelected)
- for i,snd in ipairs(v) do
- settings[snd] = isSelected
- Framework:enableSound(snd, isSelected)
- end
-
- if isSelected then
- offButton:setSelected(false)
- end
-
- -- turn on off switch?
- local s = false
- for b,_ in pairs(allButtons) do
- s = s or b:isSelected()
- end
-
- if s == false then
- offButton:setSelected(true)
- end
- end,
- soundEnabled
- )
-
- allButtons[button] = v
-
- if k ~= "SOUND_NONE" then
- -- insert suitable entry for Choice menu
- menu:addItem({
- text = self:string(k),
- style = 'item_choice',
- check = button,
- weight = 10
- })
+ if k ~= 'SOUND_CHARGING' or ( k == 'SOUND_CHARGING' and
System:hasBatteryCapability() ) then
+ local soundEnabled = Framework:isSoundEnabled(v[1])
+ effectsEnabled = effectsEnabled or soundEnabled
+ local button = Checkbox(
+ "checkbox",
+ function(obj, isSelected)
+ for i,snd in ipairs(v) do
+ settings[snd] =
isSelected
+
Framework:enableSound(snd, isSelected)
+ end
+
+ if isSelected then
+
offButton:setSelected(false)
+ end
+
+ -- turn on off switch?
+ local s = false
+ for b,_ in pairs(allButtons) do
+ s = s or b:isSelected()
+ end
+
+ if s == false then
+
offButton:setSelected(true)
+ end
+ end,
+ soundEnabled
+ )
+
+ allButtons[button] = v
+
+ if k ~= "SOUND_NONE" then
+ -- insert suitable entry for Choice menu
+ menu:addItem({
+ text = self:string(k),
+ style = 'item_choice',
+ check = button,
+ weight = 10
+ })
+ end
end
end
Modified: 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua?rev=8854&r1=8853&r2=8854&view=diff
==============================================================================
--- 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua (original)
+++ 7.5/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua Tue Jun 15
09:02:16 2010
@@ -154,6 +154,10 @@
return self:hasUSB() or self:hasSDCard() or not self:isHardware()
end
+function hasBatteryCapability(self)
+ return _capabilities["batteryCapable"] ~= nil
+end
+
-- rest is C implementation
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua?rev=8854&r1=8853&r2=8854&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay_baby/share/applets/SqueezeboxBaby/SqueezeboxBabyApplet.lua
Tue Jun 15 09:02:16 2010
@@ -147,6 +147,7 @@
["volumeKnob"] = 1,
["audioByDefault"] = 1,
["wiredNetworking"] = 1,
+ ["batteryCapable"] = 1,
})
-- warn if uuid or mac are invalid
Modified:
7.5/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/jive/7.5/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=8854&r1=8853&r2=8854&view=diff
==============================================================================
---
7.5/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.5/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Tue Jun 15 09:02:16 2010
@@ -96,6 +96,7 @@
["homeAsPowerKey"] = 1,
["deviceRotation"] = 1,
["sdcard"] = 1,
+ ["batteryCapable"] = 1,
})
-- warn if uuid or mac are invalid
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
