diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-01-12 00:24:15 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-01-12 00:24:15 +0000 |
commit | 76b257fd40217013b3107148090c2062f06097e5 (patch) | |
tree | edb08fb3b29d3fc930c7f48c6404dbde421d8a27 /apps/sound_menu.c | |
parent | 01c484c5d27906f30f7fd9f2cc3f1d9073269c95 (diff) | |
download | rockbox-76b257fd40217013b3107148090c2062f06097e5.tar.gz rockbox-76b257fd40217013b3107148090c2062f06097e5.zip |
New channel configuration setting, allowing fine-grained control of the stereo width. This replaces the 'stereo narrow' and 'stereo wide' modes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5559 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/sound_menu.c')
-rw-r--r-- | apps/sound_menu.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index de5b8c0a8c..6e5b74bfa3 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -385,19 +385,20 @@ static bool chanconf(void) | |||
385 | { | 385 | { |
386 | static const struct opt_items names[] = { | 386 | static const struct opt_items names[] = { |
387 | { STR(LANG_CHANNEL_STEREO) }, | 387 | { STR(LANG_CHANNEL_STEREO) }, |
388 | #ifdef HAVE_LCD_CHARCELLS | ||
389 | { STR(LANG_CHANNEL_STEREO_NARROW_PLAYER) }, | ||
390 | #else | ||
391 | { STR(LANG_CHANNEL_STEREO_NARROW_RECORDER) }, | ||
392 | #endif | ||
393 | { STR(LANG_CHANNEL_MONO) }, | 388 | { STR(LANG_CHANNEL_MONO) }, |
389 | { STR(LANG_CHANNEL_CUSTOM) }, | ||
394 | { STR(LANG_CHANNEL_LEFT) }, | 390 | { STR(LANG_CHANNEL_LEFT) }, |
395 | { STR(LANG_CHANNEL_RIGHT) }, | 391 | { STR(LANG_CHANNEL_RIGHT) }, |
396 | { STR(LANG_CHANNEL_KARAOKE) }, | 392 | { STR(LANG_CHANNEL_KARAOKE) } |
397 | { STR(LANG_CHANNEL_STEREO_WIDE) } | ||
398 | }; | 393 | }; |
399 | return set_option(str(LANG_CHANNEL), &global_settings.channel_config, INT, | 394 | return set_option(str(LANG_CHANNEL), &global_settings.channel_config, INT, |
400 | names, 7, set_chanconf ); | 395 | names, 6, set_chanconf ); |
396 | } | ||
397 | |||
398 | static bool stereo_width(void) | ||
399 | { | ||
400 | return set_sound(str(LANG_STEREO_WIDTH), &global_settings.stereo_width, | ||
401 | SOUND_STEREO_WIDTH); | ||
401 | } | 402 | } |
402 | 403 | ||
403 | bool sound_menu(void) | 404 | bool sound_menu(void) |
@@ -410,6 +411,7 @@ bool sound_menu(void) | |||
410 | { ID2P(LANG_TREBLE), treble }, | 411 | { ID2P(LANG_TREBLE), treble }, |
411 | { ID2P(LANG_BALANCE), balance }, | 412 | { ID2P(LANG_BALANCE), balance }, |
412 | { ID2P(LANG_CHANNEL_MENU), chanconf }, | 413 | { ID2P(LANG_CHANNEL_MENU), chanconf }, |
414 | { ID2P(LANG_STEREO_WIDTH), stereo_width }, | ||
413 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 415 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) |
414 | { ID2P(LANG_LOUDNESS), loudness }, | 416 | { ID2P(LANG_LOUDNESS), loudness }, |
415 | { ID2P(LANG_AUTOVOL), avc }, | 417 | { ID2P(LANG_AUTOVOL), avc }, |