From 22a7a2d7d34698db41bc08f76f794ca8efb3de1e Mon Sep 17 00:00:00 2001 From: Markus Braun Date: Mon, 14 Oct 2002 12:50:20 +0000 Subject: Added 12 hour clock to status bar on recorders. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2621 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'apps/settings.c') diff --git a/apps/settings.c b/apps/settings.c index e9e171250f..3dafebc368 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -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; -- cgit v1.2.3