summaryrefslogtreecommitdiff
path: root/apps/sound_menu.c
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 /apps/sound_menu.c
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 'apps/sound_menu.c')
-rw-r--r--apps/sound_menu.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/apps/sound_menu.c b/apps/sound_menu.c
index f97cdde2ab..e44aa68231 100644
--- a/apps/sound_menu.c
+++ b/apps/sound_menu.c
@@ -366,21 +366,6 @@ static bool stereo_width(void)
366 SOUND_STEREO_WIDTH); 366 SOUND_STEREO_WIDTH);
367} 367}
368 368
369#ifdef HAVE_UDA1380
370static bool sound_scaling(void)
371{
372 static const struct opt_items names[] = {
373 { STR(LANG_SCALE_VOLUME) },
374 { STR(LANG_SCALE_BASS) },
375 { STR(LANG_SCALE_CURRENT)},
376 { STR(LANG_SCALE_OFF) }
377 };
378
379 return set_option(str(LANG_SCALING_MODE), &global_settings.sound_scaling, INT,
380 names, 4, sound_set_scaling);
381}
382#endif
383
384bool sound_menu(void) 369bool sound_menu(void)
385{ 370{
386 int m; 371 int m;
@@ -395,9 +380,6 @@ bool sound_menu(void)
395#if CONFIG_CODEC == SWCODEC 380#if CONFIG_CODEC == SWCODEC
396 { ID2P(LANG_CROSSFEED), crossfeed }, 381 { ID2P(LANG_CROSSFEED), crossfeed },
397#endif 382#endif
398#ifdef HAVE_UDA1380
399 { ID2P(LANG_SCALING_MODE), sound_scaling },
400#endif
401#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) 383#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
402 { ID2P(LANG_LOUDNESS), loudness }, 384 { ID2P(LANG_LOUDNESS), loudness },
403 { ID2P(LANG_AUTOVOL), avc }, 385 { ID2P(LANG_AUTOVOL), avc },