len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugs caught and killed by Craigh Sather (patch #729910)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3665 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2003-05-09 21:29:44 +00:00
parent cc16b50124
commit 7d01e17199
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
apps/settings.c
View file

@ -678,20 +678,30 @@ void settings_load(void)
global_settings.topruntime = global_settings.topruntime =
config_block[0x28] | (config_block[0x29] << 8); config_block[0x28] | (config_block[0x29] << 8);
global_settings.fade_on_stop = config_block[0xae] & 1; if (config_block[0x29] != 0xae) {
global_settings.caption_backlight = (config_block[0xae] >> 1) & 1; global_settings.fade_on_stop = config_block[0xae] & 1;
global_settings.caption_backlight = (config_block[0xae] >> 1) & 1;
}
global_settings.peak_meter_clip_hold = (config_block[0xb0]) & 0x1f; if(config_block[0xb0] != 0xff) {
global_settings.peak_meter_performance = global_settings.peak_meter_clip_hold = (config_block[0xb0]) & 0x1f;
(config_block[0xb0] & 0x80) != 0; global_settings.peak_meter_performance =
(config_block[0xb0] & 0x80) != 0;
}
global_settings.peak_meter_release = config_block[0xb1] & 0x7f; if(config_block[0xb1] != 0xff) {
global_settings.peak_meter_dbfs = (config_block[0xb1] & 0x80) != 0; global_settings.peak_meter_release = config_block[0xb1] & 0x7f;
global_settings.peak_meter_dbfs = (config_block[0xb1] & 0x80) != 0;
}
global_settings.peak_meter_min = config_block[0xb2]; if(config_block[0xb2] != 0xff)
global_settings.peak_meter_max = config_block[0xb3]; global_settings.peak_meter_min = config_block[0xb2];
if(config_block[0xb3] != 0xff)
global_settings.peak_meter_max = config_block[0xb3];
global_settings.battery_capacity = config_block[0xb4]*50 + 1000; if(config_block[0xb4] != 0xff)
global_settings.battery_capacity = config_block[0xb4]*50 + 1000;
if (config_block[0xb5] != 0xff) if (config_block[0xb5] != 0xff)
global_settings.scroll_step = config_block[0xb5]; global_settings.scroll_step = config_block[0xb5];
@ -702,10 +712,7 @@ void settings_load(void)
if (config_block[0xb7] != 0xff) if (config_block[0xb7] != 0xff)
global_settings.bidir_limit = config_block[0xb7]; global_settings.bidir_limit = config_block[0xb7];
if (config_block[0xae] != 0xff) if (config_block[0xac] != 0xff)
global_settings.fade_on_stop = config_block[0xae];
if (config_block[0xac] != 0xff)
global_settings.max_files_in_dir = global_settings.max_files_in_dir =
config_block[0xac] | (config_block[0xad] << 8); config_block[0xac] | (config_block[0xad] << 8);
@ -1413,6 +1420,7 @@ void settings_reset(void) {
global_settings.runtime = 0; global_settings.runtime = 0;
global_settings.topruntime = 0; global_settings.topruntime = 0;
global_settings.fade_on_stop = true; global_settings.fade_on_stop = true;
global_settings.caption_backlight = false;
global_settings.max_files_in_dir = 400; global_settings.max_files_in_dir = 400;
global_settings.max_files_in_playlist = 10000; global_settings.max_files_in_playlist = 10000;
} }