summaryrefslogtreecommitdiff
path: root/firmware/export/sound.h
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-04-12 23:35:47 -0400
committerMichael Sevakis <jethead71@rockbox.org>2013-04-15 12:02:05 -0400
commit0c7b7873984e04941c9f21fa272638018fdb9a16 (patch)
treefb6afca45d2bef0a2c91732a39ffc0b965f5c557 /firmware/export/sound.h
parentfd9e2568908f91b5bcf7378dc28f6ec070d6027a (diff)
downloadrockbox-0c7b7873984e04941c9f21fa272638018fdb9a16.tar.gz
rockbox-0c7b7873984e04941c9f21fa272638018fdb9a16.zip
Straighten out the mad twisted state of sound.c and related areas.
This is going right in since it's long overdue. If anything is goofed, drop me a line or just tweak it yourself if you know what's wrong. :-) Make HW/SW codec interface more uniform when emulating HW functionality on SWCODEC for functions such as "audiohw_set_pitch". The firmware-to- DSP plumbing is in firmware/drivers/audiohw-swcodec.c. "sound_XXX" APIs are all in sound.c with none in DSP code any longer. Reduce number of settings definitions needed by each codec by providing defaults for common ones like balance, channels and SW tone controls. Remove need for separate SIM code and tables and add virtual codec header for hosted targets. Change-Id: I3f23702bca054fc9bda40f49824ce681bb7f777b
Diffstat (limited to 'firmware/export/sound.h')
-rw-r--r--firmware/export/sound.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/firmware/export/sound.h b/firmware/export/sound.h
index ebf728c7c7..fa76c67b1f 100644
--- a/firmware/export/sound.h
+++ b/firmware/export/sound.h
@@ -24,17 +24,6 @@
24#include <inttypes.h> 24#include <inttypes.h>
25#include <audiohw.h> 25#include <audiohw.h>
26 26
27
28#if CONFIG_CODEC == SWCODEC
29enum {
30 DSP_CALLBACK_SET_PRESCALE = 0,
31 DSP_CALLBACK_SET_BASS,
32 DSP_CALLBACK_SET_TREBLE,
33 DSP_CALLBACK_SET_CHANNEL_CONFIG,
34 DSP_CALLBACK_SET_STEREO_WIDTH,
35};
36#endif
37
38typedef void sound_set_type(int value); 27typedef void sound_set_type(int value);
39 28
40const char *sound_unit(int setting); 29const char *sound_unit(int setting);
@@ -45,7 +34,6 @@ int sound_max(int setting);
45int sound_default(int setting); 34int sound_default(int setting);
46sound_set_type* sound_get_fn(int setting); 35sound_set_type* sound_get_fn(int setting);
47 36
48void sound_set_dsp_callback(int (*func)(int, intptr_t));
49void sound_set_volume(int value); 37void sound_set_volume(int value);
50void sound_set_balance(int value); 38void sound_set_balance(int value);
51void sound_set_bass(int value); 39void sound_set_bass(int value);
@@ -130,10 +118,8 @@ void sound_set_superbass(int value);
130void sound_set(int setting, int value); 118void sound_set(int setting, int value);
131int sound_val2phys(int setting, int value); 119int sound_val2phys(int setting, int value);
132 120
133#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
134void sound_set_pitch(int32_t pitch); 121void sound_set_pitch(int32_t pitch);
135int32_t sound_get_pitch(void); 122int32_t sound_get_pitch(void);
136#endif
137 123
138#ifdef HAVE_PITCHCONTROL 124#ifdef HAVE_PITCHCONTROL
139/* precision of the pitch and speed variables */ 125/* precision of the pitch and speed variables */