diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2003-02-14 01:49:50 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2003-02-14 01:49:50 +0000 |
| commit | ebe0752469021dfb09f2fb2b0752e192833e9f23 (patch) | |
| tree | bd7a31557614be6a258b18a9afbd51c36ad9e2b0 /apps | |
| parent | cc9b62f6b2814cc29b104f9a7b5635cbeb104cc0 (diff) | |
| download | rockbox-ebe0752469021dfb09f2fb2b0752e192833e9f23.tar.gz rockbox-ebe0752469021dfb09f2fb2b0752e192833e9f23.zip | |
Correct saving of channel config (patch by Remo Hofer)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3252 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/main.c | 3 | ||||
| -rw-r--r-- | apps/settings.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/main.c b/apps/main.c index fd9b3760bf..5e14297f3c 100644 --- a/apps/main.c +++ b/apps/main.c @@ -169,7 +169,8 @@ void init(void) global_settings.balance, global_settings.loudness, global_settings.bass_boost, - global_settings.avc ); + global_settings.avc, + global_settings.channel_config ); status_init(); usb_start_monitoring(); diff --git a/apps/settings.c b/apps/settings.c index 200f9e17a9..bc78e823dd 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -320,8 +320,9 @@ 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 || - global_settings.channel_config << 2); + config_block[0x11] = (unsigned char) + ((global_settings.avc & 0x03) | + ((global_settings.channel_config & 0x03) << 2)); memcpy(&config_block[0x12], &global_settings.resume_index, 4); memcpy(&config_block[0x16], &global_settings.resume_offset, 4); @@ -448,6 +449,7 @@ void settings_apply(void) mpeg_sound_set(SOUND_TREBLE, global_settings.treble); 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); |