diff options
author | Teruaki Kawashima <teru@rockbox.org> | 2009-08-20 15:04:47 +0000 |
---|---|---|
committer | Teruaki Kawashima <teru@rockbox.org> | 2009-08-20 15:04:47 +0000 |
commit | 0a1728444882cdbc6a0c815bd88464de25ad94e9 (patch) | |
tree | dcc63a58339defc78a73ee85e32301a1514bb74e /apps | |
parent | e510de1b351de2e5784088bfa9db5573bb921450 (diff) | |
download | rockbox-0a1728444882cdbc6a0c815bd88464de25ad94e9.tar.gz rockbox-0a1728444882cdbc6a0c815bd88464de25ad94e9.zip |
Fix type of variable statusbar in screens.c as global_settings.statusbar is integer.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22439 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/screens.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/apps/screens.c b/apps/screens.c index 76c8c42e64..2bdd2dd061 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -181,8 +181,10 @@ void usb_screen(void) | |||
181 | /* nothing here! */ | 181 | /* nothing here! */ |
182 | #else | 182 | #else |
183 | int i; | 183 | int i; |
184 | bool statusbar = global_settings.statusbar; /* force the statusbar */ | 184 | int statusbar = global_settings.statusbar; /* force the statusbar */ |
185 | global_settings.statusbar = true; | 185 | if(!global_settings.statusbar) |
186 | global_settings.statusbar = STATUSBAR_TOP; | ||
187 | |||
186 | FOR_NB_SCREENS(i) | 188 | FOR_NB_SCREENS(i) |
187 | { | 189 | { |
188 | screens[i].backdrop_show(BACKDROP_MAIN); | 190 | screens[i].backdrop_show(BACKDROP_MAIN); |
@@ -402,7 +404,7 @@ static void charging_display_info(bool animate) | |||
402 | 404 | ||
403 | for (i = 0; i < 4; i++) | 405 | for (i = 0; i < 4; i++) |
404 | lcd_define_pattern(logo_chars[i], buf + 8 * i); | 406 | lcd_define_pattern(logo_chars[i], buf + 8 * i); |
405 | 407 | ||
406 | lcd_update(); | 408 | lcd_update(); |
407 | } | 409 | } |
408 | #endif /* (not) HAVE_LCD_BITMAP */ | 410 | #endif /* (not) HAVE_LCD_BITMAP */ |
@@ -925,7 +927,7 @@ bool browse_id3(void) | |||
925 | static char* runtime_get_data(int selected_item, void* data, | 927 | static char* runtime_get_data(int selected_item, void* data, |
926 | char* buffer, size_t buffer_len) | 928 | char* buffer, size_t buffer_len) |
927 | { | 929 | { |
928 | (void)data; | 930 | (void)data; |
929 | int t; | 931 | int t; |
930 | switch (selected_item) | 932 | switch (selected_item) |
931 | { | 933 | { |
@@ -1052,9 +1054,9 @@ int calibrate(void) | |||
1052 | enum touchscreen_mode old_mode = touchscreen_get_mode(); | 1054 | enum touchscreen_mode old_mode = touchscreen_get_mode(); |
1053 | struct touchscreen_calibration cal; | 1055 | struct touchscreen_calibration cal; |
1054 | int i, ret = 0; | 1056 | int i, ret = 0; |
1055 | bool statusbar = global_settings.statusbar; /* hide the statusbar */ | 1057 | int statusbar = global_settings.statusbar; /* hide the statusbar */ |
1058 | global_settings.statusbar = STATUSBAR_OFF; | ||
1056 | 1059 | ||
1057 | global_settings.statusbar = false; | ||
1058 | touchscreen_disable_mapping(); /* set raw mode */ | 1060 | touchscreen_disable_mapping(); /* set raw mode */ |
1059 | touchscreen_set_mode(TOUCHSCREEN_POINT); | 1061 | touchscreen_set_mode(TOUCHSCREEN_POINT); |
1060 | for(i=0; i<3; i++) | 1062 | for(i=0; i<3; i++) |