summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
authorRobert Hak <adiamas@rockbox.org>2002-10-14 09:11:59 +0000
committerRobert Hak <adiamas@rockbox.org>2002-10-14 09:11:59 +0000
commit36dc9c1c13371bbbafcba6f1ce3b5206dc134615 (patch)
treea9333f285c0195deef2abe2ef1b08ddda19eeb34 /apps/settings.c
parent1d7c10468fecc8a5d3ca0690f7287c9a95356faf (diff)
downloadrockbox-36dc9c1c13371bbbafcba6f1ce3b5206dc134615.tar.gz
rockbox-36dc9c1c13371bbbafcba6f1ce3b5206dc134615.zip
cleaning up lines > 80 chars
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2610 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c41
1 files changed, 27 insertions, 14 deletions
diff --git a/apps/settings.c b/apps/settings.c
index ab7cc9e101..e9e171250f 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -183,7 +183,8 @@ static int save_config_buffer( void )
183 for (i=0; i < RTC_BLOCK_SIZE; i++ ) { 183 for (i=0; i < RTC_BLOCK_SIZE; i++ ) {
184 int r = rtc_write(0x14+i, config_block[i]); 184 int r = rtc_write(0x14+i, config_block[i]);
185 if (r) { 185 if (r) {
186 DEBUGF( "save_config_buffer: rtc_write failed at addr 0x%02x: %d\n", 14+i, r ); 186 DEBUGF( "save_config_buffer: rtc_write failed at addr 0x%02x: %d\n",
187 14+i, r );
187 return r; 188 return r;
188 } 189 }
189 } 190 }
@@ -325,13 +326,13 @@ int settings_save( void )
325 326
326 strncpy(&config_block[0xFC], global_settings.resume_file, MAX_PATH); 327 strncpy(&config_block[0xFC], global_settings.resume_file, MAX_PATH);
327 328
328 DEBUGF("+Resume file %s\n",global_settings.resume_file); 329 DEBUGF( "+Resume file %s\n",global_settings.resume_file );
329 DEBUGF("+Resume index %X offset %X\n", 330 DEBUGF( "+Resume index %X offset %X\n",
330 global_settings.resume_index, 331 global_settings.resume_index,
331 global_settings.resume_offset); 332 global_settings.resume_offset );
332 DEBUGF("+Resume shuffle %s seed %X\n", 333 DEBUGF( "+Resume shuffle %s seed %X\n",
333 global_settings.playlist_shuffle?"on":"off", 334 global_settings.playlist_shuffle?"on":"off",
334 global_settings.resume_seed); 335 global_settings.resume_seed );
335 336
336 if(save_config_buffer()) 337 if(save_config_buffer())
337 { 338 {
@@ -372,7 +373,8 @@ void settings_apply(void)
372 ata_spindown(global_settings.disk_spindown); 373 ata_spindown(global_settings.disk_spindown);
373 set_poweroff_timeout(global_settings.poweroff); 374 set_poweroff_timeout(global_settings.poweroff);
374#ifdef HAVE_CHARGE_CTRL 375#ifdef HAVE_CHARGE_CTRL
375 charge_restart_level = global_settings.discharge ? CHARGE_RESTART_LO : CHARGE_RESTART_HI; 376 charge_restart_level = global_settings.discharge ?
377 CHARGE_RESTART_LO : CHARGE_RESTART_HI;
376#endif 378#endif
377 379
378 if ( global_settings.wps_file[0] && 380 if ( global_settings.wps_file[0] &&
@@ -655,7 +657,8 @@ void settings_reset(void) {
655 global_settings.contrast = DEFAULT_CONTRAST_SETTING; 657 global_settings.contrast = DEFAULT_CONTRAST_SETTING;
656 global_settings.poweroff = DEFAULT_POWEROFF_SETTING; 658 global_settings.poweroff = DEFAULT_POWEROFF_SETTING;
657 global_settings.backlight_timeout = DEFAULT_BACKLIGHT_TIMEOUT_SETTING; 659 global_settings.backlight_timeout = DEFAULT_BACKLIGHT_TIMEOUT_SETTING;
658 global_settings.backlight_on_when_charging = DEFAULT_BACKLIGHT_ON_WHEN_CHARGING_SETTING; 660 global_settings.backlight_on_when_charging =
661 DEFAULT_BACKLIGHT_ON_WHEN_CHARGING_SETTING;
659 global_settings.dirfilter = SHOW_MUSIC; 662 global_settings.dirfilter = SHOW_MUSIC;
660 global_settings.sort_case = false; 663 global_settings.sort_case = false;
661 global_settings.statusbar = true; 664 global_settings.statusbar = true;
@@ -689,7 +692,8 @@ void settings_display(void)
689#ifdef DEBUG 692#ifdef DEBUG
690 DEBUGF( "\nsettings_display()\n" ); 693 DEBUGF( "\nsettings_display()\n" );
691 694
692 DEBUGF( "\nvolume:\t\t%d\nbalance:\t%d\nbass:\t\t%d\ntreble:\t\t%d\nloudness:\t%d\nbass boost:\t%d\n", 695 DEBUGF( "\nvolume:\t\t%d\nbalance:\t%d\nbass:\t\t%d\ntreble:\t\t%d\n"
696 "loudness:\t%d\nbass boost:\t%d\n",
693 global_settings.volume, 697 global_settings.volume,
694 global_settings.balance, 698 global_settings.balance,
695 global_settings.bass, 699 global_settings.bass,
@@ -706,7 +710,8 @@ void settings_display(void)
706 710
707bool set_bool(char* string, bool* variable ) 711bool set_bool(char* string, bool* variable )
708{ 712{
709 return set_bool_options(string, variable, str(LANG_SET_BOOL_YES), str(LANG_SET_BOOL_NO)); 713 return set_bool_options(string, variable, str(LANG_SET_BOOL_YES),
714 str(LANG_SET_BOOL_NO));
710} 715}
711 716
712bool set_bool_options(char* string, bool* variable, 717bool set_bool_options(char* string, bool* variable,
@@ -1049,13 +1054,15 @@ bool set_time(char* string, int timedate[])
1049 break; 1054 break;
1050 case BUTTON_UP: 1055 case BUTTON_UP:
1051 case BUTTON_UP | BUTTON_REPEAT: 1056 case BUTTON_UP | BUTTON_REPEAT:
1052 timedate[cursorpos] = (timedate[cursorpos] + steps - min + 1) % steps + min; 1057 timedate[cursorpos] = (timedate[cursorpos] + steps - min + 1) %
1058 steps + min;
1053 if(timedate[cursorpos] == 0) 1059 if(timedate[cursorpos] == 0)
1054 timedate[cursorpos] += min; 1060 timedate[cursorpos] += min;
1055 break; 1061 break;
1056 case BUTTON_DOWN: 1062 case BUTTON_DOWN:
1057 case BUTTON_DOWN | BUTTON_REPEAT: 1063 case BUTTON_DOWN | BUTTON_REPEAT:
1058 timedate[cursorpos]=(timedate[cursorpos]+steps - min - 1) % steps + min; 1064 timedate[cursorpos]=(timedate[cursorpos]+steps - min - 1) %
1065 steps + min;
1059 if(timedate[cursorpos] == 0) 1066 if(timedate[cursorpos] == 0)
1060 timedate[cursorpos] += min; 1067 timedate[cursorpos] += min;
1061 break; 1068 break;
@@ -1092,3 +1099,9 @@ bool set_time(char* string, int timedate[])
1092 return false; 1099 return false;
1093} 1100}
1094#endif 1101#endif
1102
1103/* -----------------------------------------------------------------
1104 * local variables:
1105 * eval: (load-file "../firmware/rockbox-mode.el")
1106 * end:
1107 */