1
0
Fork 0
forked from len0rd/rockbox

Added 12 hour clock to status bar on recorders.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2621 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Markus Braun 2002-10-14 12:50:20 +00:00
parent c7e0bea57a
commit 22a7a2d7d3
5 changed files with 41 additions and 5 deletions

View file

@ -295,7 +295,9 @@ int settings_save( void )
((global_settings.dirfilter & 2) << 4) |
((global_settings.scrollbar & 1) << 6));
config_block[0xf] = (unsigned char)(global_settings.scroll_speed << 3);
config_block[0xf] = (unsigned char)
((global_settings.timeformat & 1) << 2) |
((global_settings.scroll_speed << 3));
config_block[0x10] = (unsigned char)
((global_settings.ff_rewind_min_step & 15) << 4 |
@ -410,7 +412,6 @@ void settings_apply(void)
*/
void settings_load(void)
{
unsigned char c;
DEBUGF( "reload_all_settings()\n" );
@ -462,9 +463,10 @@ void settings_load(void)
an uninitialized entry */
}
c = config_block[0xf] >> 3;
if (c != 31)
global_settings.scroll_speed = c;
if (config_block[0xf] != 0xFF) {
global_settings.timeformat = (config_block[0xf] >> 2) & 1;
global_settings.scroll_speed = config_block[0xf] >> 3;
}
if (config_block[0x10] != 0xFF) {
global_settings.ff_rewind_min_step = (config_block[0x10] >> 4) & 15;
@ -667,6 +669,7 @@ void settings_reset(void) {
global_settings.playlist_shuffle = false;
global_settings.discharge = 0;
global_settings.total_uptime = 0;
global_settings.timeformat = 0;
global_settings.scroll_speed = 8;
global_settings.ff_rewind_min_step = DEFAULT_FF_REWIND_MIN_STEP;
global_settings.ff_rewind_accel = DEFAULT_FF_REWIND_ACCEL_SETTING;