diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-21 13:34:45 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-21 13:34:45 +0000 |
| commit | 282b390ca889bd6c50e825473e484d8ff1a3dbb5 (patch) | |
| tree | 74488f847c6f933b9fea89b0e14e9d71d722e395 /apps | |
| parent | 169e91daa463dcc9a16fd0d7d46d4d1d5114b7ef (diff) | |
| download | rockbox-282b390ca889bd6c50e825473e484d8ff1a3dbb5.zip rockbox-282b390ca889bd6c50e825473e484d8ff1a3dbb5.tar.gz rockbox-282b390ca889bd6c50e825473e484d8ff1a3dbb5.tar.bz2 rockbox-282b390ca889bd6c50e825473e484d8ff1a3dbb5.tar.xz | |
fix the scroll delay setting
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12433 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings.c | 6 | ||||
| -rw-r--r-- | apps/settings_list.c | 19 |
2 files changed, 7 insertions, 18 deletions
diff --git a/apps/settings.c b/apps/settings.c index cb969e7..fef77a0 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -693,7 +693,7 @@ void settings_apply(void) lcd_remote_set_flip(global_settings.remote_flip_display); lcd_remote_scroll_speed(global_settings.remote_scroll_speed); lcd_remote_scroll_step(global_settings.remote_scroll_step); - lcd_remote_scroll_delay(global_settings.remote_scroll_delay * (HZ/10)); + lcd_remote_scroll_delay(global_settings.remote_scroll_delay); lcd_remote_bidir_scroll(global_settings.remote_bidir_limit); #ifdef HAVE_REMOTE_LCD_TICKING lcd_remote_emireduce(global_settings.remote_reduce_ticking); @@ -806,10 +806,10 @@ void settings_apply(void) gui_list_screen_scroll_out_of_view(global_settings.offset_out_of_view); #else lcd_jump_scroll(global_settings.jump_scroll); - lcd_jump_scroll_delay(global_settings.jump_scroll_delay * (HZ/10)); + lcd_jump_scroll_delay(global_settings.jump_scroll_delay); #endif lcd_bidir_scroll(global_settings.bidir_limit); - lcd_scroll_delay(global_settings.scroll_delay * (HZ/10)); + lcd_scroll_delay(global_settings.scroll_delay); if ( global_settings.lang_file[0]) { snprintf(buf, sizeof buf, LANG_DIR "/%s.lng", diff --git a/apps/settings_list.c b/apps/settings_list.c index 3203414..ac0264a 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -299,16 +299,6 @@ static void set_superbass(bool value) } #endif -static void scrolldelay_format(char* buffer, int buffer_size, int value, - const char* unit) -{ - (void)unit; - snprintf(buffer, buffer_size, "%d ms", value* (HZ/100)); -} -static long scrolldelay_getlang(int value) -{ - return TALK_ID(value* (HZ/100), UNIT_MS); -} #ifdef HAVE_LCD_CHARCELLS static void jumpscroll_format(char* buffer, int buffer_size, int value, const char* unit) @@ -558,8 +548,8 @@ const struct settings_list settings[] = { INT_SETTING(0, scroll_speed, LANG_SCROLL_SPEED, 9,"scroll speed", UNIT_INT, 0, 15, 1, NULL, NULL, lcd_scroll_speed), INT_SETTING(0, scroll_delay, LANG_SCROLL_DELAY, 100, "scroll delay", - UNIT_MS, 0, 2500, 100, scrolldelay_format, - scrolldelay_getlang, lcd_scroll_delay) , + UNIT_MS, 0, 2500, 100, NULL, + NULL, lcd_scroll_delay) , INT_SETTING(0, bidir_limit, LANG_BIDIR_SCROLL, 50, "bidir limit", UNIT_PERCENT, 0, 200, 25, NULL, NULL, lcd_bidir_scroll), #ifdef HAVE_REMOTE_LCD @@ -568,7 +558,7 @@ const struct settings_list settings[] = { INT_SETTING(0, remote_scroll_step, LANG_SCROLL_STEP, 6, "remote scroll step", UNIT_PIXEL, 1, LCD_REMOTE_WIDTH, 1, NULL, NULL, lcd_remote_scroll_step), INT_SETTING(0, remote_scroll_delay, LANG_SCROLL_DELAY, 100, "remote scroll delay", - UNIT_MS, 0, 2500, 100, scrolldelay_format, scrolldelay_getlang, lcd_remote_scroll_delay), + UNIT_MS, 0, 2500, 100, NULL, NULL, lcd_remote_scroll_delay), INT_SETTING(0, remote_bidir_limit, LANG_BIDIR_SCROLL, 50, "remote bidir limit", UNIT_PERCENT, 0, 200, 25, NULL, NULL, lcd_remote_bidir_scroll), #endif @@ -585,8 +575,7 @@ const struct settings_list settings[] = { INT_SETTING(0, jump_scroll, LANG_JUMP_SCROLL, 0, "jump scroll", UNIT_INT, 0, 5, 1, jumpscroll_format, jumpscroll_getlang, lcd_jump_scroll), INT_SETTING(0, jump_scroll_delay, LANG_JUMP_SCROLL_DELAY, 50, "jump scroll delay", - UNIT_MS, 0, 2500, 100, scrolldelay_format, - scrolldelay_getlang, lcd_jump_scroll_delay), + UNIT_MS, 0, 2500, 100, NULL, NULL, lcd_jump_scroll_delay), #endif OFFON_SETTING(0,scroll_paginated,LANG_SCROLL_PAGINATED, false,"scroll paginated",NULL), |