Author: titmuss
Date: Thu Feb 7 07:19:45 2008
New Revision: 1850
URL: http://svn.slimdevices.com?rev=1850&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1844): titmuss | 2008-02-07 14:08:32 +0000
Bug: 6580
Description:
The sound effects volume could never be set to zero, this prevented the DAC
from closing (to save
power).
Correctly open/close the DAC (to save power) when the sound effects are
enabled/disabled.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
trunk/jive/src/pkg/jive/src/ui/jive_audio.c
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Feb 7 07:19:45 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1843
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1844
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua?rev=1850&root=Jive&r1=1849&r2=1850&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
(original)
+++
trunk/jive/src/pkg/jive/share/applets/SetupSoundEffects/SetupSoundEffectsApplet.lua
Thu Feb 7 07:19:45 2008
@@ -194,7 +194,7 @@
function volumeShow(self)
local window = Window("window", self:string("SOUND_EFFECTS_VOLUME"),
"settingstitle")
- self.slider = Slider("volume", 1, VOLUME_STEPS, Audio:getEffectVolume()
/ VOLUME_STEP,
+ self.slider = Slider("volume", 0, VOLUME_STEPS, Audio:getEffectVolume()
/ VOLUME_STEP,
function(slider, value)
self:_setVolume(value)
end)
Modified: trunk/jive/src/pkg/jive/src/ui/jive_audio.c
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/src/ui/jive_audio.c?rev=1850&root=Jive&r1=1849&r2=1850&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/src/ui/jive_audio.c (original)
+++ trunk/jive/src/pkg/jive/src/ui/jive_audio.c Thu Feb 7 07:19:45 2008
@@ -249,6 +249,13 @@
snd = *(struct jive_sample **)lua_touserdata(L, 1);
snd->enabled = lua_toboolean(L, 2);
+ if (snd->enabled) {
+ open_audio();
+ }
+ else {
+ close_audio();
+ }
+
return 0;
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
