summaryrefslogtreecommitdiff
path: root/apps/action.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-06-29 06:37:04 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-06-29 06:37:04 +0000
commita2b6703a369f6cdbfec1f150c408dadc877631fb (patch)
tree3145a8c1372c44711d38feefeba39c7d4098f139 /apps/action.c
parent8411614b8a068a4f274c3841aa55aab1df1bc246 (diff)
downloadrockbox-a2b6703a369f6cdbfec1f150c408dadc877631fb.tar.gz
rockbox-a2b6703a369f6cdbfec1f150c408dadc877631fb.zip
Commit FS#12150 - Fully-functional audio mixer - and finally whip old limitations about playback of voice and other sounds when paused. Channels are independent in state and amplitude. Fade on stop/pause is handled by the channel's volume control rather than global volume which means it now works from anywhere. Opens up the possibility of plugin sounds during music playback by merely adding an additional channel enum. If any PCM drivers were not properly modified, see one of the last comments in the task for a description of the simple change that is expected. Some params are tunable in firmware/export/pcm-mixer.h as well.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30097 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/action.c')
-rw-r--r--apps/action.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/action.c b/apps/action.c
index eb5950bb70..aa19403703 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -205,7 +205,7 @@ static int get_action_worker(int context, int timeout,
205 /* Produce keyclick */ 205 /* Produce keyclick */
206 if (global_settings.keyclick && !(button & BUTTON_REL)) 206 if (global_settings.keyclick && !(button & BUTTON_REL))
207 if (!(button & BUTTON_REPEAT) || global_settings.keyclick_repeats) 207 if (!(button & BUTTON_REPEAT) || global_settings.keyclick_repeats)
208 pcmbuf_beep(4000, KEYCLICK_DURATION, 2500*global_settings.keyclick); 208 beep_play(4000, KEYCLICK_DURATION, 2500*global_settings.keyclick);
209#endif 209#endif
210 210
211 if ((context != last_context) && ((last_button & BUTTON_REL) == 0) 211 if ((context != last_context) && ((last_button & BUTTON_REL) == 0)