diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-04-25 22:54:58 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-04-25 22:54:58 +0000 |
commit | 668bd3445ecb39483160bbb310afa4337c83d0d9 (patch) | |
tree | 9df94188c72cd0af723012e022187b14c0d8f710 /firmware/export | |
parent | 5185d9e30a7597425aa7f77c2d323e3002c60d8e (diff) | |
download | rockbox-668bd3445ecb39483160bbb310afa4337c83d0d9.tar.gz rockbox-668bd3445ecb39483160bbb310afa4337c83d0d9.zip |
Remove lots of simulator-speficic #ifdef'ing in sound.c to allow for DSP effects in the sims, e.g. for bass and treble (targets that do those effects in HW don't simulate using dsp).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25719 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/audiohw.h | 14 | ||||
-rw-r--r-- | firmware/export/sound.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h index 91df2dd8b9..781bc12f8e 100644 --- a/firmware/export/audiohw.h +++ b/firmware/export/audiohw.h | |||
@@ -65,6 +65,20 @@ | |||
65 | #include "ak4537.h" | 65 | #include "ak4537.h" |
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | |||
69 | |||
70 | #define ONE_DB 10 | ||
71 | |||
72 | #if !defined(VOLUME_MIN) && !defined(VOLUME_MAX) | ||
73 | #warning define for VOLUME_MIN and VOLUME_MAX is missing | ||
74 | #define VOLUME_MIN -700 | ||
75 | #define VOLUME_MAX 0 | ||
76 | #endif | ||
77 | |||
78 | /* volume/balance/treble/bass interdependency main part */ | ||
79 | #define VOLUME_RANGE (VOLUME_MAX - VOLUME_MIN) | ||
80 | |||
81 | |||
68 | /* convert caps into defines */ | 82 | /* convert caps into defines */ |
69 | #ifdef AUDIOHW_CAPS | 83 | #ifdef AUDIOHW_CAPS |
70 | #if (AUDIOHW_CAPS & TREBLE_CAP) | 84 | #if (AUDIOHW_CAPS & TREBLE_CAP) |
diff --git a/firmware/export/sound.h b/firmware/export/sound.h index 2e13174516..e68ae23774 100644 --- a/firmware/export/sound.h +++ b/firmware/export/sound.h | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <inttypes.h> | 24 | #include <inttypes.h> |
25 | #include <audiohw.h> | 25 | #include <audiohw.h> |
26 | 26 | ||
27 | |||
27 | #if CONFIG_CODEC == SWCODEC | 28 | #if CONFIG_CODEC == SWCODEC |
28 | enum { | 29 | enum { |
29 | DSP_CALLBACK_SET_PRESCALE = 0, | 30 | DSP_CALLBACK_SET_PRESCALE = 0, |