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.zip rockbox-6da56d9f089743570dacaa52e3ce12338d339ca0.tar.gz rockbox-6da56d9f089743570dacaa52e3ce12338d339ca0.tar.bz2 rockbox-6da56d9f089743570dacaa52e3ce12338d339ca0.tar.xz | |
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 62cf492..8018947 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -1409,3 +1409,23 @@ id: LANG_INVERT desc: in settings_menu eng: "Invert" new: + +id: LANG_CHANNEL_STEREO_NARROW_PLAYER +desc: in sound_settings +eng: "St. Narrow" +new: + +id: LANG_CHANNEL_STEREO_NARROW_RECORDER +desc: in sound_settings +eng: "Stereo Narrow" +new: + +id: LANG_CHANNEL_STEREO_WIDE +desc: in sound_settings +eng: "Stereo Wide" +new: + +id: LANG_CHANNEL_KARAOKE +desc: in sound_settings +eng: "Karaoke" +new: diff --git a/apps/settings.c b/apps/settings.c index 7019319..a99d724 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -325,9 +325,10 @@ int settings_save( void ) config_block[0x10] = (unsigned char) ((global_settings.ff_rewind_min_step & 15) << 4 | (global_settings.ff_rewind_accel & 15)); + config_block[0x11] = (unsigned char) ((global_settings.avc & 0x03) | - ((global_settings.channel_config & 0x03) << 2)); + ((global_settings.channel_config & 0x07) << 2)); memcpy(&config_block[0x12], &global_settings.resume_index, 4); memcpy(&config_block[0x16], &global_settings.resume_offset, 4); @@ -457,7 +458,6 @@ void settings_apply(void) mpeg_sound_set(SOUND_BALANCE, global_settings.balance); mpeg_sound_set(SOUND_VOLUME, global_settings.volume); mpeg_sound_set(SOUND_CHANNELS, global_settings.channel_config); - #ifdef HAVE_MAS3587F mpeg_sound_set(SOUND_LOUDNESS, global_settings.loudness); mpeg_sound_set(SOUND_SUPERBASS, global_settings.bass_boost); @@ -598,7 +598,7 @@ void settings_load(void) if (config_block[0x11] != 0xFF) { global_settings.avc = config_block[0x11] & 0x03; - global_settings.channel_config = (config_block[0x11] >> 2) & 0x03; + global_settings.channel_config = (config_block[0x11] >> 2) & 0x07; } if (config_block[0x12] != 0xFF) diff --git a/apps/sound_menu.c b/apps/sound_menu.c index a7e01b8..9ac95e4 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c @@ -228,10 +228,17 @@ static void set_chanconf(int val) static bool chanconf(void) { - char *names[] = {str(LANG_CHANNEL_STEREO), str(LANG_CHANNEL_MONO), - str(LANG_CHANNEL_LEFT), str(LANG_CHANNEL_RIGHT) }; + char *names[] = {str(LANG_CHANNEL_STEREO), +#ifdef HAVE_LCD_CHARCELLS + str(LANG_CHANNEL_STEREO_NARROW_PLAYER), +#else + str(LANG_CHANNEL_STEREO_NARROW_RECORDER), +#endif + str(LANG_CHANNEL_MONO), + str(LANG_CHANNEL_LEFT), str(LANG_CHANNEL_RIGHT), + str(LANG_CHANNEL_KARAOKE), str(LANG_CHANNEL_STEREO_WIDE) }; return set_option(str(LANG_CHANNEL), &global_settings.channel_config, - names, 4, set_chanconf ); + names, 7, set_chanconf ); } bool sound_menu(void) |