diff options
author | Björn Stenberg <bjorn@haxx.se> | 2003-02-27 15:02:20 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2003-02-27 15:02:20 +0000 |
commit | 6da56d9f089743570dacaa52e3ce12338d339ca0 (patch) | |
tree | bb44408a014fe25b36bbbf54e9b950427a013a97 /apps | |
parent | b1079200d34b197a9ea0ec649168b0a307ee9517 (diff) | |
download | rockbox-6da56d9f089743570dacaa52e3ce12338d339ca0.tar.gz rockbox-6da56d9f089743570dacaa52e3ce12338d339ca0.zip |
Added three new channel modes: Stereo narrow, Stereo wide, and Karaoke (voice filter). Patch by Remo Hofer.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3356 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 20 | ||||
-rw-r--r-- | apps/settings.c | 6 | ||||
-rw-r--r-- | apps/sound_menu.c | 13 |
3 files changed, 33 insertions, 6 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 62cf492abc..8018947561 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -1409,3 +1409,23 @@ id: LANG_INVERT | |||
1409 | desc: in settings_menu | 1409 | desc: in settings_menu |
1410 | eng: "Invert" | 1410 | eng: "Invert" |
1411 | new: | 1411 | new: |
1412 | |||
1413 | id: LANG_CHANNEL_STEREO_NARROW_PLAYER | ||
1414 | desc: in sound_settings | ||
1415 | eng: "St. Narrow" | ||
1416 | new: | ||
1417 | |||
1418 | id: LANG_CHANNEL_STEREO_NARROW_RECORDER | ||
1419 | desc: in sound_settings | ||
1420 | eng: "Stereo Narrow" | ||
1421 | new: | ||
1422 | |||
1423 | id: LANG_CHANNEL_STEREO_WIDE | ||
1424 | desc: in sound_settings | ||
1425 | eng: "Stereo Wide" | ||
1426 | new: | ||
1427 | |||
1428 | id: LANG_CHANNEL_KARAOKE | ||
1429 | desc: in sound_settings | ||
1430 | eng: "Karaoke" | ||
1431 | new: | ||
diff --git a/apps/settings.c b/apps/settings.c index 7019319fb3..a99d7244d4 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -325,9 +325,10 @@ int settings_save( void ) | |||
325 | config_block[0x10] = (unsigned char) | 325 | config_block[0x10] = (unsigned char) |
326 | ((global_settings.ff_rewind_min_step & 15) << 4 | | 326 | ((global_settings.ff_rewind_min_step & 15) << 4 | |
327 | (global_settings.ff_rewind_accel & 15)); | 327 | (global_settings.ff_rewind_accel & 15)); |
328 | |||
328 | config_block[0x11] = (unsigned char) | 329 | config_block[0x11] = (unsigned char) |
329 | ((global_settings.avc & 0x03) | | 330 | ((global_settings.avc & 0x03) | |
330 | ((global_settings.channel_config & 0x03) << 2)); | 331 | ((global_settings.channel_config & 0x07) << 2)); |
331 | 332 | ||
332 | memcpy(&config_block[0x12], &global_settings.resume_index, 4); | 333 | memcpy(&config_block[0x12], &global_settings.resume_index, 4); |
333 | memcpy(&config_block[0x16], &global_settings.resume_offset, 4); | 334 | memcpy(&config_block[0x16], &global_settings.resume_offset, 4); |
@@ -457,7 +458,6 @@ void settings_apply(void) | |||
457 | mpeg_sound_set(SOUND_BALANCE, global_settings.balance); | 458 | mpeg_sound_set(SOUND_BALANCE, global_settings.balance); |
458 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 459 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); |
459 | mpeg_sound_set(SOUND_CHANNELS, global_settings.channel_config); | 460 | mpeg_sound_set(SOUND_CHANNELS, global_settings.channel_config); |
460 | |||
461 | #ifdef HAVE_MAS3587F | 461 | #ifdef HAVE_MAS3587F |
462 | mpeg_sound_set(SOUND_LOUDNESS, global_settings.loudness); | 462 | mpeg_sound_set(SOUND_LOUDNESS, global_settings.loudness); |
463 | mpeg_sound_set(SOUND_SUPERBASS, global_settings.bass_boost); | 463 | mpeg_sound_set(SOUND_SUPERBASS, global_settings.bass_boost); |
@@ -598,7 +598,7 @@ void settings_load(void) | |||
598 | if (config_block[0x11] != 0xFF) | 598 | if (config_block[0x11] != 0xFF) |
599 | { | 599 | { |
600 | global_settings.avc = config_block[0x11] & 0x03; | 600 | global_settings.avc = config_block[0x11] & 0x03; |
601 | global_settings.channel_config = (config_block[0x11] >> 2) & 0x03; | 601 | global_settings.channel_config = (config_block[0x11] >> 2) & 0x07; |
602 | } | 602 | } |
603 | 603 | ||
604 | if (config_block[0x12] != 0xFF) | 604 | if (config_block[0x12] != 0xFF) |
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index a7e01b8c8e..9ac95e46b8 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -228,10 +228,17 @@ static void set_chanconf(int val) | |||
228 | 228 | ||
229 | static bool chanconf(void) | 229 | static bool chanconf(void) |
230 | { | 230 | { |
231 | char *names[] = {str(LANG_CHANNEL_STEREO), str(LANG_CHANNEL_MONO), | 231 | char *names[] = {str(LANG_CHANNEL_STEREO), |
232 | str(LANG_CHANNEL_LEFT), str(LANG_CHANNEL_RIGHT) }; | 232 | #ifdef HAVE_LCD_CHARCELLS |
233 | str(LANG_CHANNEL_STEREO_NARROW_PLAYER), | ||
234 | #else | ||
235 | str(LANG_CHANNEL_STEREO_NARROW_RECORDER), | ||
236 | #endif | ||
237 | str(LANG_CHANNEL_MONO), | ||
238 | str(LANG_CHANNEL_LEFT), str(LANG_CHANNEL_RIGHT), | ||
239 | str(LANG_CHANNEL_KARAOKE), str(LANG_CHANNEL_STEREO_WIDE) }; | ||
233 | return set_option(str(LANG_CHANNEL), &global_settings.channel_config, | 240 | return set_option(str(LANG_CHANNEL), &global_settings.channel_config, |
234 | names, 4, set_chanconf ); | 241 | names, 7, set_chanconf ); |
235 | } | 242 | } |
236 | 243 | ||
237 | bool sound_menu(void) | 244 | bool sound_menu(void) |