diff options
author | Thom Johansen <thomj@rockbox.org> | 2007-03-07 19:11:16 +0000 |
---|---|---|
committer | Thom Johansen <thomj@rockbox.org> | 2007-03-07 19:11:16 +0000 |
commit | 99b2742cd0de7181677f3aa7222caa5dc358ee12 (patch) | |
tree | 55c0cec293ca3fb1c35dc5fa983bb03bff54785d /firmware | |
parent | 09b97b4a21921f05d29d215e0d5cf7df4f83a472 (diff) | |
download | rockbox-99b2742cd0de7181677f3aa7222caa5dc358ee12.tar.gz rockbox-99b2742cd0de7181677f3aa7222caa5dc358ee12.zip |
Use the new DSP callback functionality in firmware/sound.c to deal with SWCODEC stereo width and channel configuration instead of the old more spread out #ifdef based approach. Rename the DSP functions involved for more consistent naming.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12677 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/sound.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/firmware/sound.c b/firmware/sound.c index 6182e6b567..7b29e1f13f 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -169,12 +169,14 @@ sound_set_type* sound_get_fn(int setting) | |||
169 | return NULL; | 169 | return NULL; |
170 | } | 170 | } |
171 | 171 | ||
172 | #ifdef HAVE_SW_TONE_CONTROLS | 172 | #if CONFIG_CODEC == SWCODEC |
173 | /* Copied from dsp.h, nasty nasty, but we don't want to include dsp.h */ | 173 | /* Copied from dsp.h, nasty nasty, but we don't want to include dsp.h */ |
174 | enum { | 174 | enum { |
175 | DSP_CALLBACK_SET_PRESCALE = 0, | 175 | DSP_CALLBACK_SET_PRESCALE = 0, |
176 | DSP_CALLBACK_SET_BASS, | 176 | DSP_CALLBACK_SET_BASS, |
177 | DSP_CALLBACK_SET_TREBLE | 177 | DSP_CALLBACK_SET_TREBLE, |
178 | DSP_CALLBACK_SET_CHANNEL_CONFIG, | ||
179 | DSP_CALLBACK_SET_STEREO_WIDTH | ||
178 | }; | 180 | }; |
179 | 181 | ||
180 | static int (*dsp_callback)(int, intptr_t) = NULL; | 182 | static int (*dsp_callback)(int, intptr_t) = NULL; |
@@ -567,7 +569,7 @@ void sound_set_treble(int value) | |||
567 | void sound_set_channels(int value) | 569 | void sound_set_channels(int value) |
568 | { | 570 | { |
569 | #if CONFIG_CODEC == SWCODEC | 571 | #if CONFIG_CODEC == SWCODEC |
570 | (void)value; | 572 | dsp_callback(DSP_CALLBACK_SET_CHANNEL_CONFIG, value); |
571 | #else | 573 | #else |
572 | if(!audio_is_initialized) | 574 | if(!audio_is_initialized) |
573 | return; | 575 | return; |
@@ -579,7 +581,7 @@ void sound_set_channels(int value) | |||
579 | void sound_set_stereo_width(int value) | 581 | void sound_set_stereo_width(int value) |
580 | { | 582 | { |
581 | #if CONFIG_CODEC == SWCODEC | 583 | #if CONFIG_CODEC == SWCODEC |
582 | (void)value; | 584 | dsp_callback(DSP_CALLBACK_SET_STEREO_WIDTH, value); |
583 | #else | 585 | #else |
584 | if(!audio_is_initialized) | 586 | if(!audio_is_initialized) |
585 | return; | 587 | return; |