summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-12-07 23:07:07 +0000
committerJens Arnold <amiconn@rockbox.org>2005-12-07 23:07:07 +0000
commit2993ae69b5cfd95ddab595fcce9cc7637477d6a5 (patch)
tree1a9ba25c51db3d7313621da6dcf5bb4192cfea9d /firmware/export
parentec32c08a357bde454c11a41375230461509f2fe2 (diff)
downloadrockbox-2993ae69b5cfd95ddab595fcce9cc7637477d6a5.tar.gz
rockbox-2993ae69b5cfd95ddab595fcce9cc7637477d6a5.zip
Simplified and uniform volume handling: * Volume setting in dB on all targets, within the 'natural' range defined by the respective DAC (limited to -100..+12 dB for archos Recorders and Ondios in order to avoid 4 chars being displayed in the status bar). 0 dB means line level on all targets. * No more artificial volume limiting for Iriver and Player, settings always represent true values. Removed the various sound scaling options. * Bumped config version so save your settings. Also make sure to adjust the volume after loading a .cfg, then save the .cfg again, otherwise the volume will be out of range (a flaw in the .cfg loader).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8197 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/sound.h15
1 files changed, 0 insertions, 15 deletions
diff --git a/firmware/export/sound.h b/firmware/export/sound.h
index 3c7dec62b0..2c002063db 100644
--- a/firmware/export/sound.h
+++ b/firmware/export/sound.h
@@ -26,9 +26,6 @@ enum {
26 SOUND_BALANCE, 26 SOUND_BALANCE,
27 SOUND_CHANNELS, 27 SOUND_CHANNELS,
28 SOUND_STEREO_WIDTH, 28 SOUND_STEREO_WIDTH,
29#ifdef HAVE_UDA1380
30 SOUND_SCALING,
31#endif
32#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) 29#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
33 SOUND_LOUDNESS, 30 SOUND_LOUDNESS,
34 SOUND_AVC, 31 SOUND_AVC,
@@ -59,15 +56,6 @@ enum {
59 SOUND_CHAN_KARAOKE, 56 SOUND_CHAN_KARAOKE,
60}; 57};
61 58
62#ifdef HAVE_UDA1380
63enum {
64 SOUND_SCALE_VOLUME = 0,
65 SOUND_SCALE_BASS,
66 SOUND_SCALE_CURRENT,
67 SOUND_SCALE_OFF
68};
69#endif
70
71typedef void sound_set_type(int value); 59typedef void sound_set_type(int value);
72 60
73const char *sound_unit(int setting); 61const char *sound_unit(int setting);
@@ -84,9 +72,6 @@ void sound_set_bass(int value);
84void sound_set_treble(int value); 72void sound_set_treble(int value);
85void sound_set_channels(int value); 73void sound_set_channels(int value);
86void sound_set_stereo_width(int value); 74void sound_set_stereo_width(int value);
87#ifdef HAVE_UDA1380
88void sound_set_scaling(int value);
89#endif
90#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) 75#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
91void sound_set_loudness(int value); 76void sound_set_loudness(int value);
92void sound_set_avc(int value); 77void sound_set_avc(int value);