diff options
author | Kjell Ericson <kjell@haxx.se> | 2003-05-28 09:00:27 +0000 |
---|---|---|
committer | Kjell Ericson <kjell@haxx.se> | 2003-05-28 09:00:27 +0000 |
commit | 849469af281b6e71da7e86181764863887aab48f (patch) | |
tree | c92a0e0c2e0a69b66a11624381db08a3c5761488 /apps/settings.c | |
parent | ab691704d8d01dcad4fc6c0f10b7d9307769f217 (diff) | |
download | rockbox-849469af281b6e71da7e86181764863887aab48f.tar.gz rockbox-849469af281b6e71da7e86181764863887aab48f.zip |
Moved the settings for jump scroll to a more correct place.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3705 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/apps/settings.c b/apps/settings.c index 368f05ff9e..f89b1abc53 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -126,6 +126,8 @@ modified unless the header & checksum test fails. | |||
126 | 126 | ||
127 | 127 | ||
128 | Rest of config block, only saved to disk: | 128 | Rest of config block, only saved to disk: |
129 | 0xA8 (char)jump scroll mode (only for player) | ||
130 | 0xA9 (char)jump scroll delay (only for player) | ||
129 | 0xAA Max number of files in playlist (1000-20000) | 131 | 0xAA Max number of files in playlist (1000-20000) |
130 | 0xAC Max number of files in dir (50-10000) | 132 | 0xAC Max number of files in dir (50-10000) |
131 | 0xAE fade on pause/unpause/stop setting (bit 0) | 133 | 0xAE fade on pause/unpause/stop setting (bit 0) |
@@ -143,9 +145,7 @@ Rest of config block, only saved to disk: | |||
143 | 0xE0 (char[20]) Font file | 145 | 0xE0 (char[20]) Font file |
144 | 0xF4 (int) Playlist first index | 146 | 0xF4 (int) Playlist first index |
145 | 0xF8 (int) Playlist shuffle seed | 147 | 0xF8 (int) Playlist shuffle seed |
146 | 0xFC (char[260]) Resume playlist (path/to/dir or path/to/playlist.m3u) | 148 | 0xFC-0x1FF (char[260]) Resume playlist (path/to/dir or path/to/playlist.m3u) |
147 | 0xFD (char)jump scroll mode (only for player) | ||
148 | 0xFE (char)jump scroll delay (only for player) | ||
149 | 149 | ||
150 | *************************************/ | 150 | *************************************/ |
151 | 151 | ||
@@ -383,6 +383,10 @@ int settings_save( void ) | |||
383 | config_block[0x29]=(unsigned char)(global_settings.topruntime >> 8); | 383 | config_block[0x29]=(unsigned char)(global_settings.topruntime >> 8); |
384 | } | 384 | } |
385 | 385 | ||
386 | #ifdef HAVE_LCD_CHARCELLS | ||
387 | config_block[0xa8]=(unsigned char)global_settings.jump_scroll; | ||
388 | config_block[0xa9]=(unsigned char)global_settings.jump_scroll_delay; | ||
389 | #endif | ||
386 | config_block[0xaa] = (unsigned char) | 390 | config_block[0xaa] = (unsigned char) |
387 | global_settings.max_files_in_playlist & 0xff; | 391 | global_settings.max_files_in_playlist & 0xff; |
388 | config_block[0xab] = (unsigned char) | 392 | config_block[0xab] = (unsigned char) |
@@ -413,10 +417,6 @@ int settings_save( void ) | |||
413 | memcpy(&config_block[0xF8], &global_settings.resume_seed, 4); | 417 | memcpy(&config_block[0xF8], &global_settings.resume_seed, 4); |
414 | 418 | ||
415 | strncpy(&config_block[0xFC], global_settings.resume_file, MAX_PATH); | 419 | strncpy(&config_block[0xFC], global_settings.resume_file, MAX_PATH); |
416 | #ifdef HAVE_LCD_CHARCELLS | ||
417 | config_block[0xfd]=(unsigned char)global_settings.jump_scroll; | ||
418 | config_block[0xfe]=(unsigned char)global_settings.jump_scroll_delay; | ||
419 | #endif | ||
420 | DEBUGF( "+Resume file %s\n",global_settings.resume_file ); | 420 | DEBUGF( "+Resume file %s\n",global_settings.resume_file ); |
421 | DEBUGF( "+Resume index %X offset %X\n", | 421 | DEBUGF( "+Resume index %X offset %X\n", |
422 | global_settings.resume_index, | 422 | global_settings.resume_index, |
@@ -535,7 +535,7 @@ void settings_apply(void) | |||
535 | lcd_scroll_step(global_settings.scroll_step); | 535 | lcd_scroll_step(global_settings.scroll_step); |
536 | #else | 536 | #else |
537 | lcd_jump_scroll(global_settings.jump_scroll); | 537 | lcd_jump_scroll(global_settings.jump_scroll); |
538 | lcd_jump_scroll_delay(global_settings.jump_scroll_delay); | 538 | lcd_jump_scroll_delay(global_settings.jump_scroll_delay * (HZ/10)); |
539 | #endif | 539 | #endif |
540 | lcd_bidir_scroll(global_settings.bidir_limit); | 540 | lcd_bidir_scroll(global_settings.bidir_limit); |
541 | lcd_scroll_delay(global_settings.scroll_delay * (HZ/10)); | 541 | lcd_scroll_delay(global_settings.scroll_delay * (HZ/10)); |
@@ -735,13 +735,13 @@ void settings_load(void) | |||
735 | strncpy(global_settings.lang_file, &config_block[0xcc], MAX_FILENAME); | 735 | strncpy(global_settings.lang_file, &config_block[0xcc], MAX_FILENAME); |
736 | strncpy(global_settings.font_file, &config_block[0xe0], MAX_FILENAME); | 736 | strncpy(global_settings.font_file, &config_block[0xe0], MAX_FILENAME); |
737 | strncpy(global_settings.resume_file, &config_block[0xFC], MAX_PATH); | 737 | strncpy(global_settings.resume_file, &config_block[0xFC], MAX_PATH); |
738 | global_settings.resume_file[MAX_PATH]=0; | ||
738 | #ifdef HAVE_LCD_CHARSCELLS | 739 | #ifdef HAVE_LCD_CHARSCELLS |
739 | if (config_block[0xfd] != 0xff) | 740 | if (config_block[0xa8] != 0xff) |
740 | global_settings.jump_scroll = config_block[0xfd]; | 741 | global_settings.jump_scroll = config_block[0xa8]; |
741 | if (config_block[0xfe] != 0xff) | 742 | if (config_block[0xa9] != 0xff) |
742 | global_settings.jump_scroll_delay = config_block[0xfe]; | 743 | global_settings.jump_scroll_delay = config_block[0xa9]; |
743 | #endif | 744 | #endif |
744 | global_settings.resume_file[MAX_PATH]=0; | ||
745 | } | 745 | } |
746 | 746 | ||
747 | settings_apply(); | 747 | settings_apply(); |