diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-03-16 21:56:08 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-03-16 21:56:08 +0000 |
commit | 4d6374c9236b93e0bd457f99944164fc493d1120 (patch) | |
tree | ff9630fcef66e63c61cc0a74e97f21220e668f75 | |
parent | 2c643b9f3e22ee07f7949a5471f726758dc40841 (diff) | |
download | rockbox-4d6374c9236b93e0bd457f99944164fc493d1120.tar.gz rockbox-4d6374c9236b93e0bd457f99944164fc493d1120.zip |
Get rid of the 'center' parameter for splashes. There were only 2 of almost 500 splashes which were not centered.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12807 a1c6a512-1295-4272-9138-f99709370657
107 files changed, 524 insertions, 548 deletions
diff --git a/apps/action.c b/apps/action.c index 31770cdb4e..80053e7646 100644 --- a/apps/action.c +++ b/apps/action.c | |||
@@ -131,7 +131,7 @@ static int get_action_worker(int context, int timeout, | |||
131 | { | 131 | { |
132 | last_button = BUTTON_NONE; | 132 | last_button = BUTTON_NONE; |
133 | keys_locked = false; | 133 | keys_locked = false; |
134 | gui_syncsplash(HZ/2, true, str(LANG_KEYLOCK_OFF_PLAYER)); | 134 | gui_syncsplash(HZ/2, str(LANG_KEYLOCK_OFF_PLAYER)); |
135 | return ACTION_REDRAW; | 135 | return ACTION_REDRAW; |
136 | } | 136 | } |
137 | else | 137 | else |
@@ -140,7 +140,7 @@ static int get_action_worker(int context, int timeout, | |||
140 | #endif | 140 | #endif |
141 | { | 141 | { |
142 | if ((button&BUTTON_REL)) | 142 | if ((button&BUTTON_REL)) |
143 | gui_syncsplash(HZ/2, true, str(LANG_KEYLOCK_ON_PLAYER)); | 143 | gui_syncsplash(HZ/2, str(LANG_KEYLOCK_ON_PLAYER)); |
144 | return ACTION_REDRAW; | 144 | return ACTION_REDRAW; |
145 | } | 145 | } |
146 | } | 146 | } |
@@ -180,7 +180,7 @@ static int get_action_worker(int context, int timeout, | |||
180 | unlock_combo = button; | 180 | unlock_combo = button; |
181 | keys_locked = true; | 181 | keys_locked = true; |
182 | action_signalscreenchange(); | 182 | action_signalscreenchange(); |
183 | gui_syncsplash(HZ/2, true, str(LANG_KEYLOCK_ON_PLAYER)); | 183 | gui_syncsplash(HZ/2, str(LANG_KEYLOCK_ON_PLAYER)); |
184 | 184 | ||
185 | button_clear_queue(); | 185 | button_clear_queue(); |
186 | return ACTION_REDRAW; | 186 | return ACTION_REDRAW; |
diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c index 47c28c43f4..f537aeac95 100644 --- a/apps/alarm_menu.c +++ b/apps/alarm_menu.c | |||
@@ -97,11 +97,11 @@ bool alarm_screen(void) | |||
97 | rtc_init(); | 97 | rtc_init(); |
98 | rtc_set_alarm(h,m); | 98 | rtc_set_alarm(h,m); |
99 | rtc_enable_alarm(true); | 99 | rtc_enable_alarm(true); |
100 | gui_syncsplash(HZ*2, true, str(LANG_ALARM_MOD_TIME_TO_GO), | 100 | gui_syncsplash(HZ*2, str(LANG_ALARM_MOD_TIME_TO_GO), |
101 | togo / 60, togo % 60); | 101 | togo / 60, togo % 60); |
102 | done = true; | 102 | done = true; |
103 | } else { | 103 | } else { |
104 | gui_syncsplash(HZ, true, str(LANG_ALARM_MOD_ERROR)); | 104 | gui_syncsplash(HZ, str(LANG_ALARM_MOD_ERROR)); |
105 | update = true; | 105 | update = true; |
106 | } | 106 | } |
107 | break; | 107 | break; |
@@ -144,7 +144,7 @@ bool alarm_screen(void) | |||
144 | 144 | ||
145 | case ACTION_STD_CANCEL: | 145 | case ACTION_STD_CANCEL: |
146 | rtc_enable_alarm(false); | 146 | rtc_enable_alarm(false); |
147 | gui_syncsplash(HZ*2, true, str(LANG_ALARM_MOD_DISABLE)); | 147 | gui_syncsplash(HZ*2, str(LANG_ALARM_MOD_DISABLE)); |
148 | done = true; | 148 | done = true; |
149 | break; | 149 | break; |
150 | 150 | ||
diff --git a/apps/bookmark.c b/apps/bookmark.c index 5905fdcd7a..a86e2a6504 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -226,7 +226,7 @@ static bool write_bookmark(bool create_bookmark_file) | |||
226 | } | 226 | } |
227 | } | 227 | } |
228 | 228 | ||
229 | gui_syncsplash(HZ, true, str(success ? LANG_BOOKMARK_CREATE_SUCCESS | 229 | gui_syncsplash(HZ, str(success ? LANG_BOOKMARK_CREATE_SUCCESS |
230 | : LANG_BOOKMARK_CREATE_FAILURE)); | 230 | : LANG_BOOKMARK_CREATE_FAILURE)); |
231 | 231 | ||
232 | return true; | 232 | return true; |
@@ -520,7 +520,7 @@ static char* select_bookmark(const char* bookmark_file_name) | |||
520 | /* if there were no bookmarks in the file, delete the file and exit. */ | 520 | /* if there were no bookmarks in the file, delete the file and exit. */ |
521 | if(bookmark_id <= 0) | 521 | if(bookmark_id <= 0) |
522 | { | 522 | { |
523 | gui_syncsplash(HZ, true, str(LANG_BOOKMARK_LOAD_EMPTY)); | 523 | gui_syncsplash(HZ, str(LANG_BOOKMARK_LOAD_EMPTY)); |
524 | remove(bookmark_file_name); | 524 | remove(bookmark_file_name); |
525 | action_signalscreenchange(); | 525 | action_signalscreenchange(); |
526 | return NULL; | 526 | return NULL; |
diff --git a/apps/codecs.c b/apps/codecs.c index ccfa449d51..1de83588c1 100644 --- a/apps/codecs.c +++ b/apps/codecs.c | |||
@@ -312,7 +312,7 @@ int codec_load_file(const char *plugin, struct codec_api *api) | |||
312 | if (fd < 0) { | 312 | if (fd < 0) { |
313 | snprintf(msgbuf, sizeof(msgbuf)-1, "Couldn't load codec: %s", path); | 313 | snprintf(msgbuf, sizeof(msgbuf)-1, "Couldn't load codec: %s", path); |
314 | logf("Codec load error:%d", fd); | 314 | logf("Codec load error:%d", fd); |
315 | gui_syncsplash(HZ*2, true, msgbuf); | 315 | gui_syncsplash(HZ*2, msgbuf); |
316 | return fd; | 316 | return fd; |
317 | } | 317 | } |
318 | 318 | ||
diff --git a/apps/codecs.h b/apps/codecs.h index ceba2bf852..7c7224ec80 100644 --- a/apps/codecs.h +++ b/apps/codecs.h | |||
@@ -90,12 +90,12 @@ | |||
90 | #define CODEC_ENC_MAGIC 0x52454E43 /* RENC */ | 90 | #define CODEC_ENC_MAGIC 0x52454E43 /* RENC */ |
91 | 91 | ||
92 | /* increase this every time the api struct changes */ | 92 | /* increase this every time the api struct changes */ |
93 | #define CODEC_API_VERSION 16 | 93 | #define CODEC_API_VERSION 17 |
94 | 94 | ||
95 | /* update this to latest version if a change to the api struct breaks | 95 | /* update this to latest version if a change to the api struct breaks |
96 | backwards compatibility (and please take the opportunity to sort in any | 96 | backwards compatibility (and please take the opportunity to sort in any |
97 | new function which are "waiting" at the end of the function table) */ | 97 | new function which are "waiting" at the end of the function table) */ |
98 | #define CODEC_MIN_API_VERSION 16 | 98 | #define CODEC_MIN_API_VERSION 17 |
99 | 99 | ||
100 | /* codec return codes */ | 100 | /* codec return codes */ |
101 | enum codec_status { | 101 | enum codec_status { |
@@ -166,7 +166,7 @@ struct codec_api { | |||
166 | /* Configure different codec buffer parameters. */ | 166 | /* Configure different codec buffer parameters. */ |
167 | void (*configure)(int setting, intptr_t value); | 167 | void (*configure)(int setting, intptr_t value); |
168 | 168 | ||
169 | void (*splash)(int ticks, bool center, const unsigned char *fmt, ...); | 169 | void (*splash)(int ticks, const unsigned char *fmt, ...); |
170 | 170 | ||
171 | /* file */ | 171 | /* file */ |
172 | int (*PREFIX(open))(const char* pathname, int flags); | 172 | int (*PREFIX(open))(const char* pathname, int flags); |
diff --git a/apps/codecs/speex.c b/apps/codecs/speex.c index 8dd9f012dd..348fa4e317 100644 --- a/apps/codecs/speex.c +++ b/apps/codecs/speex.c | |||
@@ -288,7 +288,7 @@ int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos, | |||
288 | 288 | ||
289 | LOGF("Seek failed:%d\n", offset); | 289 | LOGF("Seek failed:%d\n", offset); |
290 | 290 | ||
291 | ci->splash(HZ*2, true, "Seek failed"); | 291 | ci->splash(HZ*2, "Seek failed"); |
292 | 292 | ||
293 | return -1; | 293 | return -1; |
294 | } | 294 | } |
diff --git a/apps/codecs/vorbis.c b/apps/codecs/vorbis.c index 7e7ef365b2..2ea0f74645 100644 --- a/apps/codecs/vorbis.c +++ b/apps/codecs/vorbis.c | |||
@@ -79,7 +79,7 @@ bool vorbis_set_codec_parameters(OggVorbis_File *vf) | |||
79 | vi = ov_info(vf, -1); | 79 | vi = ov_info(vf, -1); |
80 | 80 | ||
81 | if (vi == NULL) { | 81 | if (vi == NULL) { |
82 | //ci->splash(HZ*2, true, "Vorbis Error"); | 82 | //ci->splash(HZ*2, "Vorbis Error"); |
83 | return false; | 83 | return false; |
84 | } | 84 | } |
85 | 85 | ||
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 71094c0dd9..c3532dbf8b 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -2030,7 +2030,7 @@ static bool dbg_save_roms(void) | |||
2030 | 2030 | ||
2031 | err = eeprom_24cxx_read(0, buf, sizeof buf); | 2031 | err = eeprom_24cxx_read(0, buf, sizeof buf); |
2032 | if (err) | 2032 | if (err) |
2033 | gui_syncsplash(HZ*3, true, "Eeprom read failure (%d)",err); | 2033 | gui_syncsplash(HZ*3, "Eeprom read failure (%d)",err); |
2034 | else | 2034 | else |
2035 | { | 2035 | { |
2036 | write(fd, buf, sizeof buf); | 2036 | write(fd, buf, sizeof buf); |
@@ -2123,7 +2123,7 @@ extern bool do_screendump_instead_of_usb; | |||
2123 | static bool dbg_screendump(void) | 2123 | static bool dbg_screendump(void) |
2124 | { | 2124 | { |
2125 | do_screendump_instead_of_usb = !do_screendump_instead_of_usb; | 2125 | do_screendump_instead_of_usb = !do_screendump_instead_of_usb; |
2126 | gui_syncsplash(HZ, true, "Screendump %s", | 2126 | gui_syncsplash(HZ, "Screendump %s", |
2127 | do_screendump_instead_of_usb?"enabled":"disabled"); | 2127 | do_screendump_instead_of_usb?"enabled":"disabled"); |
2128 | return false; | 2128 | return false; |
2129 | } | 2129 | } |
@@ -2314,21 +2314,21 @@ static bool dbg_write_eeprom(void) | |||
2314 | 2314 | ||
2315 | err = eeprom_24cxx_write(0, buf, sizeof buf); | 2315 | err = eeprom_24cxx_write(0, buf, sizeof buf); |
2316 | if (err) | 2316 | if (err) |
2317 | gui_syncsplash(HZ*3, true, "Eeprom write failure (%d)",err); | 2317 | gui_syncsplash(HZ*3, "Eeprom write failure (%d)",err); |
2318 | else | 2318 | else |
2319 | gui_syncsplash(HZ*3, true, "Eeprom written successfully"); | 2319 | gui_syncsplash(HZ*3, "Eeprom written successfully"); |
2320 | 2320 | ||
2321 | set_irq_level(old_irq_level); | 2321 | set_irq_level(old_irq_level); |
2322 | } | 2322 | } |
2323 | else | 2323 | else |
2324 | { | 2324 | { |
2325 | gui_syncsplash(HZ*3, true, "File read error (%d)",rc); | 2325 | gui_syncsplash(HZ*3, "File read error (%d)",rc); |
2326 | } | 2326 | } |
2327 | close(fd); | 2327 | close(fd); |
2328 | } | 2328 | } |
2329 | else | 2329 | else |
2330 | { | 2330 | { |
2331 | gui_syncsplash(HZ*3, true, "Failed to open 'internal_eeprom.bin'"); | 2331 | gui_syncsplash(HZ*3, "Failed to open 'internal_eeprom.bin'"); |
2332 | } | 2332 | } |
2333 | 2333 | ||
2334 | return false; | 2334 | return false; |
diff --git a/apps/filetree.c b/apps/filetree.c index edf4fa0b63..b875e81d48 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -360,14 +360,14 @@ int ft_enter(struct tree_context* c) | |||
360 | switch ( file->attr & TREE_ATTR_MASK ) { | 360 | switch ( file->attr & TREE_ATTR_MASK ) { |
361 | case TREE_ATTR_M3U: | 361 | case TREE_ATTR_M3U: |
362 | if (global_settings.party_mode) { | 362 | if (global_settings.party_mode) { |
363 | gui_syncsplash(HZ, true, str(LANG_PARTY_MODE)); | 363 | gui_syncsplash(HZ, str(LANG_PARTY_MODE)); |
364 | break; | 364 | break; |
365 | } | 365 | } |
366 | 366 | ||
367 | if (bookmark_autoload(buf)) | 367 | if (bookmark_autoload(buf)) |
368 | break; | 368 | break; |
369 | 369 | ||
370 | gui_syncsplash(0, true, str(LANG_WAIT)); | 370 | gui_syncsplash(0, str(LANG_WAIT)); |
371 | 371 | ||
372 | /* about to create a new current playlist... | 372 | /* about to create a new current playlist... |
373 | allow user to cancel the operation */ | 373 | allow user to cancel the operation */ |
@@ -395,7 +395,7 @@ int ft_enter(struct tree_context* c) | |||
395 | if (bookmark_autoload(c->currdir)) | 395 | if (bookmark_autoload(c->currdir)) |
396 | break; | 396 | break; |
397 | 397 | ||
398 | gui_syncsplash(0, true, str(LANG_WAIT)); | 398 | gui_syncsplash(0, str(LANG_WAIT)); |
399 | 399 | ||
400 | /* about to create a new current playlist... | 400 | /* about to create a new current playlist... |
401 | allow user to cancel the operation */ | 401 | allow user to cancel the operation */ |
@@ -414,7 +414,7 @@ int ft_enter(struct tree_context* c) | |||
414 | { | 414 | { |
415 | playlist_insert_track(NULL, buf, | 415 | playlist_insert_track(NULL, buf, |
416 | PLAYLIST_INSERT_LAST, true, true); | 416 | PLAYLIST_INSERT_LAST, true, true); |
417 | gui_syncsplash(HZ, true, str(LANG_QUEUE_LAST)); | 417 | gui_syncsplash(HZ, str(LANG_QUEUE_LAST)); |
418 | } | 418 | } |
419 | else if (playlist_create(c->currdir, NULL) != -1) | 419 | else if (playlist_create(c->currdir, NULL) != -1) |
420 | { | 420 | { |
@@ -439,7 +439,7 @@ int ft_enter(struct tree_context* c) | |||
439 | /* fmr preset file */ | 439 | /* fmr preset file */ |
440 | case TREE_ATTR_FMR: | 440 | case TREE_ATTR_FMR: |
441 | 441 | ||
442 | gui_syncsplash(0, true, str(LANG_WAIT)); | 442 | gui_syncsplash(0, str(LANG_WAIT)); |
443 | 443 | ||
444 | /* Preset inside the default folder. */ | 444 | /* Preset inside the default folder. */ |
445 | if(!strncasecmp(FMPRESET_PATH, buf, strlen(FMPRESET_PATH))) | 445 | if(!strncasecmp(FMPRESET_PATH, buf, strlen(FMPRESET_PATH))) |
@@ -466,7 +466,7 @@ int ft_enter(struct tree_context* c) | |||
466 | 466 | ||
467 | /* wps config file */ | 467 | /* wps config file */ |
468 | case TREE_ATTR_WPS: | 468 | case TREE_ATTR_WPS: |
469 | gui_syncsplash(0, true, str(LANG_WAIT)); | 469 | gui_syncsplash(0, str(LANG_WAIT)); |
470 | #if LCD_DEPTH > 1 | 470 | #if LCD_DEPTH > 1 |
471 | unload_wps_backdrop(); | 471 | unload_wps_backdrop(); |
472 | #endif | 472 | #endif |
@@ -478,7 +478,7 @@ int ft_enter(struct tree_context* c) | |||
478 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) | 478 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
479 | /* remote-wps config file */ | 479 | /* remote-wps config file */ |
480 | case TREE_ATTR_RWPS: | 480 | case TREE_ATTR_RWPS: |
481 | gui_syncsplash(0, true, str(LANG_WAIT)); | 481 | gui_syncsplash(0, str(LANG_WAIT)); |
482 | wps_data_load(gui_wps[1].data, buf, true); | 482 | wps_data_load(gui_wps[1].data, buf, true); |
483 | set_file(buf, (char *)global_settings.rwps_file, | 483 | set_file(buf, (char *)global_settings.rwps_file, |
484 | MAX_FILENAME); | 484 | MAX_FILENAME); |
@@ -486,39 +486,39 @@ int ft_enter(struct tree_context* c) | |||
486 | #endif | 486 | #endif |
487 | 487 | ||
488 | case TREE_ATTR_CFG: | 488 | case TREE_ATTR_CFG: |
489 | gui_syncsplash(0, true, str(LANG_WAIT)); | 489 | gui_syncsplash(0, str(LANG_WAIT)); |
490 | if (!settings_load_config(buf,true)) | 490 | if (!settings_load_config(buf,true)) |
491 | break; | 491 | break; |
492 | gui_syncsplash(HZ, true, str(LANG_SETTINGS_LOADED)); | 492 | gui_syncsplash(HZ, str(LANG_SETTINGS_LOADED)); |
493 | break; | 493 | break; |
494 | 494 | ||
495 | case TREE_ATTR_BMARK: | 495 | case TREE_ATTR_BMARK: |
496 | gui_syncsplash(0, true, str(LANG_WAIT)); | 496 | gui_syncsplash(0, str(LANG_WAIT)); |
497 | bookmark_load(buf, false); | 497 | bookmark_load(buf, false); |
498 | reload_dir = true; | 498 | reload_dir = true; |
499 | break; | 499 | break; |
500 | 500 | ||
501 | case TREE_ATTR_LNG: | 501 | case TREE_ATTR_LNG: |
502 | gui_syncsplash(0, true, str(LANG_WAIT)); | 502 | gui_syncsplash(0, str(LANG_WAIT)); |
503 | if(!lang_load(buf)) { | 503 | if(!lang_load(buf)) { |
504 | set_file(buf, (char *)global_settings.lang_file, | 504 | set_file(buf, (char *)global_settings.lang_file, |
505 | MAX_FILENAME); | 505 | MAX_FILENAME); |
506 | talk_init(); /* use voice of same language */ | 506 | talk_init(); /* use voice of same language */ |
507 | gui_syncsplash(HZ, true, str(LANG_LANGUAGE_LOADED)); | 507 | gui_syncsplash(HZ, str(LANG_LANGUAGE_LOADED)); |
508 | } | 508 | } |
509 | break; | 509 | break; |
510 | 510 | ||
511 | #ifdef HAVE_LCD_BITMAP | 511 | #ifdef HAVE_LCD_BITMAP |
512 | case TREE_ATTR_FONT: | 512 | case TREE_ATTR_FONT: |
513 | gui_syncsplash(0, true, str(LANG_WAIT)); | 513 | gui_syncsplash(0, str(LANG_WAIT)); |
514 | font_load(buf); | 514 | font_load(buf); |
515 | set_file(buf, (char *)global_settings.font_file, MAX_FILENAME); | 515 | set_file(buf, (char *)global_settings.font_file, MAX_FILENAME); |
516 | break; | 516 | break; |
517 | 517 | ||
518 | case TREE_ATTR_KBD: | 518 | case TREE_ATTR_KBD: |
519 | gui_syncsplash(0, true, str(LANG_WAIT)); | 519 | gui_syncsplash(0, str(LANG_WAIT)); |
520 | if (!load_kbd(buf)) | 520 | if (!load_kbd(buf)) |
521 | gui_syncsplash(HZ, true, str(LANG_KEYBOARD_LOADED)); | 521 | gui_syncsplash(HZ, str(LANG_KEYBOARD_LOADED)); |
522 | set_file(buf, (char *)global_settings.kbd_file, MAX_FILENAME); | 522 | set_file(buf, (char *)global_settings.kbd_file, MAX_FILENAME); |
523 | break; | 523 | break; |
524 | #endif | 524 | #endif |
@@ -526,7 +526,7 @@ int ft_enter(struct tree_context* c) | |||
526 | #ifndef SIMULATOR | 526 | #ifndef SIMULATOR |
527 | /* firmware file */ | 527 | /* firmware file */ |
528 | case TREE_ATTR_MOD: | 528 | case TREE_ATTR_MOD: |
529 | gui_syncsplash(0, true, str(LANG_WAIT)); | 529 | gui_syncsplash(0, str(LANG_WAIT)); |
530 | rolo_load(buf); | 530 | rolo_load(buf); |
531 | break; | 531 | break; |
532 | #endif | 532 | #endif |
@@ -534,11 +534,11 @@ int ft_enter(struct tree_context* c) | |||
534 | /* plugin file */ | 534 | /* plugin file */ |
535 | case TREE_ATTR_ROCK: | 535 | case TREE_ATTR_ROCK: |
536 | if (global_settings.party_mode) { | 536 | if (global_settings.party_mode) { |
537 | gui_syncsplash(HZ, true, str(LANG_PARTY_MODE)); | 537 | gui_syncsplash(HZ, str(LANG_PARTY_MODE)); |
538 | break; | 538 | break; |
539 | } | 539 | } |
540 | 540 | ||
541 | gui_syncsplash(0, true, str(LANG_WAIT)); | 541 | gui_syncsplash(0, str(LANG_WAIT)); |
542 | 542 | ||
543 | if (plugin_load(buf,NULL) == PLUGIN_USB_CONNECTED) | 543 | if (plugin_load(buf,NULL) == PLUGIN_USB_CONNECTED) |
544 | { | 544 | { |
@@ -560,7 +560,7 @@ int ft_enter(struct tree_context* c) | |||
560 | char* plugin; | 560 | char* plugin; |
561 | 561 | ||
562 | if (global_settings.party_mode) { | 562 | if (global_settings.party_mode) { |
563 | gui_syncsplash(HZ, true, str(LANG_PARTY_MODE)); | 563 | gui_syncsplash(HZ, str(LANG_PARTY_MODE)); |
564 | break; | 564 | break; |
565 | } | 565 | } |
566 | 566 | ||
diff --git a/apps/filetypes.c b/apps/filetypes.c index c26b50bb0f..49ce1c72aa 100644 --- a/apps/filetypes.c +++ b/apps/filetypes.c | |||
@@ -340,14 +340,14 @@ static void scan_plugins(void) | |||
340 | /* exttypes[] full, bail out */ | 340 | /* exttypes[] full, bail out */ |
341 | if (cnt_exttypes >= MAX_EXTTYPES) | 341 | if (cnt_exttypes >= MAX_EXTTYPES) |
342 | { | 342 | { |
343 | gui_syncsplash(HZ, true, str(LANG_FILETYPES_EXTENSION_FULL)); | 343 | gui_syncsplash(HZ, str(LANG_FILETYPES_EXTENSION_FULL)); |
344 | break; | 344 | break; |
345 | } | 345 | } |
346 | 346 | ||
347 | /* filetypes[] full, bail out */ | 347 | /* filetypes[] full, bail out */ |
348 | if (cnt_filetypes >= MAX_FILETYPES) | 348 | if (cnt_filetypes >= MAX_FILETYPES) |
349 | { | 349 | { |
350 | gui_syncsplash(HZ, true, str(LANG_FILETYPES_FULL)); | 350 | gui_syncsplash(HZ, str(LANG_FILETYPES_FULL)); |
351 | break; | 351 | break; |
352 | } | 352 | } |
353 | 353 | ||
@@ -380,7 +380,7 @@ static void scan_plugins(void) | |||
380 | /* filter out to long filenames */ | 380 | /* filter out to long filenames */ |
381 | if (strlen((char *)entry->d_name) > MAX_PLUGIN_LENGTH + 5) | 381 | if (strlen((char *)entry->d_name) > MAX_PLUGIN_LENGTH + 5) |
382 | { | 382 | { |
383 | gui_syncsplash(HZ, true, str(LANG_FILETYPES_PLUGIN_NAME_LONG)); | 383 | gui_syncsplash(HZ, str(LANG_FILETYPES_PLUGIN_NAME_LONG)); |
384 | continue; | 384 | continue; |
385 | } | 385 | } |
386 | 386 | ||
@@ -561,13 +561,13 @@ static bool read_config(const char* file) | |||
561 | { | 561 | { |
562 | if (cnt_exttypes >= MAX_EXTTYPES) | 562 | if (cnt_exttypes >= MAX_EXTTYPES) |
563 | { | 563 | { |
564 | gui_syncsplash(HZ, true, str(LANG_FILETYPES_EXTENSION_FULL)); | 564 | gui_syncsplash(HZ, str(LANG_FILETYPES_EXTENSION_FULL)); |
565 | break; | 565 | break; |
566 | } | 566 | } |
567 | 567 | ||
568 | if (cnt_filetypes >= MAX_FILETYPES) | 568 | if (cnt_filetypes >= MAX_FILETYPES) |
569 | { | 569 | { |
570 | gui_syncsplash(HZ, true, str(LANG_FILETYPES_FULL)); | 570 | gui_syncsplash(HZ, str(LANG_FILETYPES_FULL)); |
571 | break; | 571 | break; |
572 | } | 572 | } |
573 | 573 | ||
@@ -636,7 +636,7 @@ static bool read_config(const char* file) | |||
636 | { | 636 | { |
637 | if (strlen(str[plugin]) > MAX_PLUGIN_LENGTH) | 637 | if (strlen(str[plugin]) > MAX_PLUGIN_LENGTH) |
638 | { | 638 | { |
639 | gui_syncsplash(HZ, true, str(LANG_FILETYPES_PLUGIN_NAME_LONG)); | 639 | gui_syncsplash(HZ, str(LANG_FILETYPES_PLUGIN_NAME_LONG)); |
640 | str[plugin] = NULL; | 640 | str[plugin] = NULL; |
641 | continue; | 641 | continue; |
642 | } | 642 | } |
@@ -736,7 +736,7 @@ static char* string2icon(const char* str) | |||
736 | (unsigned long) string_buffer - | 736 | (unsigned long) string_buffer - |
737 | (unsigned long) next_free_string) < ICON_LENGTH) | 737 | (unsigned long) next_free_string) < ICON_LENGTH) |
738 | { | 738 | { |
739 | gui_syncsplash(HZ, true, str(LANG_FILETYPES_STRING_BUFFER_EMPTY)); | 739 | gui_syncsplash(HZ, str(LANG_FILETYPES_STRING_BUFFER_EMPTY)); |
740 | return NULL; | 740 | return NULL; |
741 | } | 741 | } |
742 | 742 | ||
@@ -792,7 +792,7 @@ static char* get_string(const char* str) | |||
792 | } | 792 | } |
793 | else | 793 | else |
794 | { | 794 | { |
795 | gui_syncsplash(HZ, true, str(LANG_FILETYPES_STRING_BUFFER_EMPTY)); | 795 | gui_syncsplash(HZ, str(LANG_FILETYPES_STRING_BUFFER_EMPTY)); |
796 | return NULL; | 796 | return NULL; |
797 | } | 797 | } |
798 | } | 798 | } |
diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c index 08c05d958f..2d0dba1221 100644 --- a/apps/gui/color_picker.c +++ b/apps/gui/color_picker.c | |||
@@ -392,7 +392,7 @@ bool set_color(struct screen *display, char *title, unsigned *color, | |||
392 | if (banned_color != (unsigned)-1 && | 392 | if (banned_color != (unsigned)-1 && |
393 | banned_color == rgb.color) | 393 | banned_color == rgb.color) |
394 | { | 394 | { |
395 | gui_syncsplash(HZ*2, true, str(LANG_COLOR_UNACCEPTABLE)); | 395 | gui_syncsplash(HZ*2, str(LANG_COLOR_UNACCEPTABLE)); |
396 | break; | 396 | break; |
397 | } | 397 | } |
398 | *color = rgb.color; | 398 | *color = rgb.color; |
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 2f86c9dedb..24ecd8b051 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -2336,8 +2336,8 @@ bool update_onvol_change(struct gui_wps * gwps) | |||
2336 | gui_wps_refresh(gwps, 0, WPS_REFRESH_NON_STATIC); | 2336 | gui_wps_refresh(gwps, 0, WPS_REFRESH_NON_STATIC); |
2337 | 2337 | ||
2338 | #ifdef HAVE_LCD_CHARCELLS | 2338 | #ifdef HAVE_LCD_CHARCELLS |
2339 | gui_splash(gwps->display,0, false, "Vol: %d dB ", | 2339 | gui_splash(gwps->display, 0, "Vol: %3d dB", |
2340 | sound_val2phys(SOUND_VOLUME, global_settings.volume)); | 2340 | sound_val2phys(SOUND_VOLUME, global_settings.volume)); |
2341 | return true; | 2341 | return true; |
2342 | #endif | 2342 | #endif |
2343 | return false; | 2343 | return false; |
@@ -2494,10 +2494,10 @@ bool gui_wps_display(void) | |||
2494 | { | 2494 | { |
2495 | global_status.resume_index = -1; | 2495 | global_status.resume_index = -1; |
2496 | #ifdef HAVE_LCD_CHARCELLS | 2496 | #ifdef HAVE_LCD_CHARCELLS |
2497 | gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST_PLAYER)); | 2497 | gui_syncsplash(HZ, str(LANG_END_PLAYLIST_PLAYER)); |
2498 | #else | 2498 | #else |
2499 | gui_syncstatusbar_draw(&statusbars, true); | 2499 | gui_syncstatusbar_draw(&statusbars, true); |
2500 | gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST_RECORDER)); | 2500 | gui_syncsplash(HZ, str(LANG_END_PLAYLIST_RECORDER)); |
2501 | #endif | 2501 | #endif |
2502 | return true; | 2502 | return true; |
2503 | } | 2503 | } |
@@ -2651,6 +2651,6 @@ void display_keylock_text(bool locked) | |||
2651 | else | 2651 | else |
2652 | s = str(LANG_KEYLOCK_OFF_RECORDER); | 2652 | s = str(LANG_KEYLOCK_OFF_RECORDER); |
2653 | #endif | 2653 | #endif |
2654 | gui_syncsplash(HZ, true, s); | 2654 | gui_syncsplash(HZ, s); |
2655 | } | 2655 | } |
2656 | 2656 | ||
diff --git a/apps/gui/splash.c b/apps/gui/splash.c index 30909217b2..4234171207 100644 --- a/apps/gui/splash.c +++ b/apps/gui/splash.c | |||
@@ -39,8 +39,7 @@ | |||
39 | 39 | ||
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | static void splash(struct screen * screen, bool center, | 42 | static void splash(struct screen * screen, const char *fmt, va_list ap) |
43 | const char *fmt, va_list ap) | ||
44 | { | 43 | { |
45 | char splash_buf[MAXBUFFER]; | 44 | char splash_buf[MAXBUFFER]; |
46 | short widths[MAXLINES]; | 45 | short widths[MAXLINES]; |
@@ -127,43 +126,33 @@ static void splash(struct screen * screen, bool center, | |||
127 | #ifdef HAVE_LCD_BITMAP | 126 | #ifdef HAVE_LCD_BITMAP |
128 | /* If we center the display, then just clear the box we need and put | 127 | /* If we center the display, then just clear the box we need and put |
129 | a nice little frame and put the text in there! */ | 128 | a nice little frame and put the text in there! */ |
130 | if (center) | 129 | y = (screen->height - y) / 2; /* height => y start position */ |
131 | { | 130 | x = (screen->width - maxw) / 2 - 2; |
132 | y = (screen->height - y) / 2; /* height => y start position */ | ||
133 | x = (screen->width - maxw) / 2 - 2; | ||
134 | 131 | ||
135 | #if LCD_DEPTH > 1 | 132 | #if LCD_DEPTH > 1 |
136 | if (screen->depth > 1) | 133 | if (screen->depth > 1) |
137 | { | 134 | { |
138 | prevfg = screen->get_foreground(); | 135 | prevfg = screen->get_foreground(); |
139 | screen->set_drawmode(DRMODE_FG); | 136 | screen->set_drawmode(DRMODE_FG); |
140 | screen->set_foreground( | 137 | screen->set_foreground( |
141 | SCREEN_COLOR_TO_NATIVE(screen, LCD_LIGHTGRAY)); | 138 | SCREEN_COLOR_TO_NATIVE(screen, LCD_LIGHTGRAY)); |
142 | } | 139 | } |
143 | else | 140 | else |
144 | #endif | 141 | #endif |
145 | screen->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); | 142 | screen->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); |
146 | 143 | ||
147 | screen->fillrect(x, y-2, maxw+4, screen->height-y*2+4); | 144 | screen->fillrect(x, y-2, maxw+4, screen->height-y*2+4); |
148 | 145 | ||
149 | #if LCD_DEPTH > 1 | 146 | #if LCD_DEPTH > 1 |
150 | if (screen->depth > 1) | 147 | if (screen->depth > 1) |
151 | screen->set_foreground( | 148 | screen->set_foreground(SCREEN_COLOR_TO_NATIVE(screen, LCD_BLACK)); |
152 | SCREEN_COLOR_TO_NATIVE(screen, LCD_BLACK)); | 149 | else |
153 | else | ||
154 | #endif | 150 | #endif |
155 | screen->set_drawmode(DRMODE_SOLID); | 151 | screen->set_drawmode(DRMODE_SOLID); |
156 | 152 | ||
157 | screen->drawrect(x, y-2, maxw+4, screen->height-y*2+4); | 153 | screen->drawrect(x, y-2, maxw+4, screen->height-y*2+4); |
158 | } | ||
159 | else | ||
160 | { | ||
161 | y = 0; | ||
162 | x = 0; | ||
163 | screen->clear_display(); | ||
164 | } | ||
165 | #else /* HAVE_LCD_CHARCELLS */ | 154 | #else /* HAVE_LCD_CHARCELLS */ |
166 | y = 0; /* vertical center on 2 lines would be silly */ | 155 | y = 0; /* vertical centering on 2 lines would be silly */ |
167 | x = 0; | 156 | x = 0; |
168 | screen->clear_display(); | 157 | screen->clear_display(); |
169 | #endif | 158 | #endif |
@@ -172,8 +161,7 @@ static void splash(struct screen * screen, bool center, | |||
172 | 161 | ||
173 | for (i = 0; i <= line; i++) | 162 | for (i = 0; i <= line; i++) |
174 | { | 163 | { |
175 | if (center) | 164 | x = MAX((screen->width - widths[i]) / 2, 0); |
176 | x = MAX((screen->width - widths[i]) / 2, 0); | ||
177 | 165 | ||
178 | #ifdef HAVE_LCD_BITMAP | 166 | #ifdef HAVE_LCD_BITMAP |
179 | screen->putsxy(x, y, lines[i]); | 167 | screen->putsxy(x, y, lines[i]); |
@@ -184,7 +172,7 @@ static void splash(struct screen * screen, bool center, | |||
184 | } | 172 | } |
185 | 173 | ||
186 | #if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH > 1) | 174 | #if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH > 1) |
187 | if (center && screen->depth > 1) | 175 | if (screen->depth > 1) |
188 | { | 176 | { |
189 | screen->set_foreground(prevfg); | 177 | screen->set_foreground(prevfg); |
190 | screen->set_drawmode(DRMODE_SOLID); | 178 | screen->set_drawmode(DRMODE_SOLID); |
@@ -195,25 +183,25 @@ static void splash(struct screen * screen, bool center, | |||
195 | #endif | 183 | #endif |
196 | } | 184 | } |
197 | 185 | ||
198 | void gui_splash(struct screen * screen, int ticks, | 186 | void gui_splash(struct screen * screen, int ticks, |
199 | bool center, const unsigned char *fmt, ...) | 187 | const unsigned char *fmt, ...) |
200 | { | 188 | { |
201 | va_list ap; | 189 | va_list ap; |
202 | va_start( ap, fmt ); | 190 | va_start( ap, fmt ); |
203 | splash(screen, center, fmt, ap); | 191 | splash(screen, fmt, ap); |
204 | va_end( ap ); | 192 | va_end( ap ); |
205 | 193 | ||
206 | if(ticks) | 194 | if(ticks) |
207 | sleep(ticks); | 195 | sleep(ticks); |
208 | } | 196 | } |
209 | 197 | ||
210 | void gui_syncsplash(int ticks, bool center, const unsigned char *fmt, ...) | 198 | void gui_syncsplash(int ticks, const unsigned char *fmt, ...) |
211 | { | 199 | { |
212 | va_list ap; | 200 | va_list ap; |
213 | int i; | 201 | int i; |
214 | va_start( ap, fmt ); | 202 | va_start( ap, fmt ); |
215 | FOR_NB_SCREENS(i) | 203 | FOR_NB_SCREENS(i) |
216 | splash(&(screens[i]), center, fmt, ap); | 204 | splash(&(screens[i]), fmt, ap); |
217 | va_end( ap ); | 205 | va_end( ap ); |
218 | 206 | ||
219 | if(ticks) | 207 | if(ticks) |
diff --git a/apps/gui/splash.h b/apps/gui/splash.h index b1ac15c537..589be95033 100644 --- a/apps/gui/splash.h +++ b/apps/gui/splash.h | |||
@@ -22,24 +22,19 @@ | |||
22 | #include "screen_access.h" | 22 | #include "screen_access.h" |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * Puts a splash message on the given screen for a given period | 25 | * Puts a splash message centered on the given screen for a given period |
26 | * - screen : the screen to put the splash on | 26 | * - screen : the screen to put the splash on |
27 | * - ticks : how long the splash is displayed (in rb ticks) | 27 | * - ticks : how long the splash is displayed (in rb ticks) |
28 | * - center : FALSE means left-justified, TRUE means | ||
29 | * horizontal and vertical center | ||
30 | * - fmt : what to say *printf style | 28 | * - fmt : what to say *printf style |
31 | */ | 29 | */ |
32 | extern void gui_splash(struct screen * screen, int ticks, | 30 | extern void gui_splash(struct screen * screen, int ticks, |
33 | bool center, const char *fmt, ...); | 31 | const char *fmt, ...); |
34 | 32 | ||
35 | /* | 33 | /* |
36 | * Puts a splash message on all the screens for a given period | 34 | * Puts a splash message centered on all the screens for a given period |
37 | * - ticks : how long the splash is displayed (in rb ticks) | 35 | * - ticks : how long the splash is displayed (in rb ticks) |
38 | * - center : FALSE means left-justified, TRUE means | ||
39 | * horizontal and vertical center | ||
40 | * - fmt : what to say *printf style | 36 | * - fmt : what to say *printf style |
41 | */ | 37 | */ |
42 | extern void gui_syncsplash(int ticks, bool center, | 38 | extern void gui_syncsplash(int ticks, const unsigned char *fmt, ...); |
43 | const unsigned char *fmt, ...); | ||
44 | 39 | ||
45 | #endif /* _GUI_ICON_H_ */ | 40 | #endif /* _GUI_ICON_H_ */ |
diff --git a/apps/main.c b/apps/main.c index 8ad32446b3..916720a5d3 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -146,7 +146,7 @@ static int init_dircache(bool preinit) | |||
146 | { | 146 | { |
147 | /* This will be in default language, settings are not | 147 | /* This will be in default language, settings are not |
148 | applied yet. Not really any easy way to fix that. */ | 148 | applied yet. Not really any easy way to fix that. */ |
149 | gui_syncsplash(0, true, str(LANG_DIRCACHE_BUILDING)); | 149 | gui_syncsplash(0, str(LANG_DIRCACHE_BUILDING)); |
150 | clear = true; | 150 | clear = true; |
151 | } | 151 | } |
152 | 152 | ||
@@ -164,14 +164,14 @@ static int init_dircache(bool preinit) | |||
164 | { | 164 | { |
165 | if (global_status.dircache_size <= 0) | 165 | if (global_status.dircache_size <= 0) |
166 | { | 166 | { |
167 | gui_syncsplash(0, true, str(LANG_DIRCACHE_BUILDING)); | 167 | gui_syncsplash(0, str(LANG_DIRCACHE_BUILDING)); |
168 | clear = true; | 168 | clear = true; |
169 | } | 169 | } |
170 | result = dircache_build(global_status.dircache_size); | 170 | result = dircache_build(global_status.dircache_size); |
171 | } | 171 | } |
172 | 172 | ||
173 | if (result < 0) | 173 | if (result < 0) |
174 | gui_syncsplash(0, true, "Failed! Result: %d", result); | 174 | gui_syncsplash(0, "Failed! Result: %d", result); |
175 | } | 175 | } |
176 | 176 | ||
177 | if (clear) | 177 | if (clear) |
@@ -206,7 +206,7 @@ static void init_tagcache(void) | |||
206 | if (ret > 0) | 206 | if (ret > 0) |
207 | { | 207 | { |
208 | #ifdef HAVE_LCD_BITMAP | 208 | #ifdef HAVE_LCD_BITMAP |
209 | gui_syncsplash(0, true, "%s [%d/%d]", | 209 | gui_syncsplash(0, "%s [%d/%d]", |
210 | str(LANG_TAGCACHE_INIT), ret, | 210 | str(LANG_TAGCACHE_INIT), ret, |
211 | tagcache_get_max_commit_step()); | 211 | tagcache_get_max_commit_step()); |
212 | #else | 212 | #else |
@@ -458,7 +458,7 @@ static void init(void) | |||
458 | if (button_hold()) | 458 | if (button_hold()) |
459 | #endif | 459 | #endif |
460 | { | 460 | { |
461 | gui_syncsplash(HZ*2, true, str(LANG_RESET_DONE_CLEAR)); | 461 | gui_syncsplash(HZ*2, str(LANG_RESET_DONE_CLEAR)); |
462 | settings_reset(); | 462 | settings_reset(); |
463 | } | 463 | } |
464 | else | 464 | else |
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c index 65b17a73c9..0cf63bb20d 100644 --- a/apps/menus/eq_menu.c +++ b/apps/menus/eq_menu.c | |||
@@ -589,12 +589,12 @@ static bool eq_save_preset(void) | |||
589 | if (!kbd_input(filename, sizeof filename)) { | 589 | if (!kbd_input(filename, sizeof filename)) { |
590 | fd = creat(filename); | 590 | fd = creat(filename); |
591 | if (fd < 0) | 591 | if (fd < 0) |
592 | gui_syncsplash(HZ, true, str(LANG_FAILED)); | 592 | gui_syncsplash(HZ, str(LANG_FAILED)); |
593 | else | 593 | else |
594 | break; | 594 | break; |
595 | } | 595 | } |
596 | else { | 596 | else { |
597 | gui_syncsplash(HZ, true, str(LANG_MENU_SETTING_CANCEL)); | 597 | gui_syncsplash(HZ, str(LANG_MENU_SETTING_CANCEL)); |
598 | return false; | 598 | return false; |
599 | } | 599 | } |
600 | } | 600 | } |
@@ -613,7 +613,7 @@ static bool eq_save_preset(void) | |||
613 | 613 | ||
614 | close(fd); | 614 | close(fd); |
615 | 615 | ||
616 | gui_syncsplash(HZ, true, str(LANG_SETTINGS_SAVED)); | 616 | gui_syncsplash(HZ, str(LANG_SETTINGS_SAVED)); |
617 | 617 | ||
618 | return true; | 618 | return true; |
619 | } | 619 | } |
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 0e7e7f7bc2..2e034162e5 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -320,7 +320,7 @@ static bool show_info(void) | |||
320 | 320 | ||
321 | #ifndef SIMULATOR | 321 | #ifndef SIMULATOR |
322 | case ACTION_STD_OK: | 322 | case ACTION_STD_OK: |
323 | gui_syncsplash(0, true, str(LANG_DIRCACHE_BUILDING)); | 323 | gui_syncsplash(0, str(LANG_DIRCACHE_BUILDING)); |
324 | fat_recalc_free(IF_MV(0)); | 324 | fat_recalc_free(IF_MV(0)); |
325 | #ifdef HAVE_MULTIVOLUME | 325 | #ifdef HAVE_MULTIVOLUME |
326 | if (fat_ismounted(1)) | 326 | if (fat_ismounted(1)) |
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index ebfb52eaa0..1f6c96e421 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c | |||
@@ -136,7 +136,7 @@ int audioscrobbler_callback(int action,const struct menu_item_ex *this_item) | |||
136 | { | 136 | { |
137 | case ACTION_EXIT_MENUITEM: /* on exit */ | 137 | case ACTION_EXIT_MENUITEM: /* on exit */ |
138 | if (!scrobbler_is_enabled() && global_settings.audioscrobbler) | 138 | if (!scrobbler_is_enabled() && global_settings.audioscrobbler) |
139 | gui_syncsplash(HZ*2, true, str(LANG_PLEASE_REBOOT)); | 139 | gui_syncsplash(HZ*2, str(LANG_PLEASE_REBOOT)); |
140 | 140 | ||
141 | if(scrobbler_is_enabled() && !global_settings.audioscrobbler) | 141 | if(scrobbler_is_enabled() && !global_settings.audioscrobbler) |
142 | scrobbler_shutdown(); | 142 | scrobbler_shutdown(); |
@@ -154,7 +154,7 @@ int cuesheet_callback(int action,const struct menu_item_ex *this_item) | |||
154 | { | 154 | { |
155 | case ACTION_EXIT_MENUITEM: /* on exit */ | 155 | case ACTION_EXIT_MENUITEM: /* on exit */ |
156 | if (!cuesheet_is_enabled() && global_settings.cuesheet) | 156 | if (!cuesheet_is_enabled() && global_settings.cuesheet) |
157 | gui_syncsplash(HZ*2, true, str(LANG_PLEASE_REBOOT)); | 157 | gui_syncsplash(HZ*2, str(LANG_PLEASE_REBOOT)); |
158 | break; | 158 | break; |
159 | } | 159 | } |
160 | return action; | 160 | return action; |
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 6173c15501..76763b101d 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -638,7 +638,7 @@ bool rectrigger(void) | |||
638 | 638 | ||
639 | switch (button) { | 639 | switch (button) { |
640 | case ACTION_STD_CANCEL: | 640 | case ACTION_STD_CANCEL: |
641 | gui_syncsplash(50, true, str(LANG_MENU_SETTING_CANCEL)); | 641 | gui_syncsplash(50, str(LANG_MENU_SETTING_CANCEL)); |
642 | global_settings.rec_start_thres = old_start_thres; | 642 | global_settings.rec_start_thres = old_start_thres; |
643 | global_settings.rec_start_duration = old_start_duration; | 643 | global_settings.rec_start_duration = old_start_duration; |
644 | global_settings.rec_prerecord_time = old_prerecord_time; | 644 | global_settings.rec_prerecord_time = old_prerecord_time; |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index dd9ad731bb..27d44fd1cf 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -49,13 +49,13 @@ | |||
49 | static void tagcache_rebuild_with_splash(void) | 49 | static void tagcache_rebuild_with_splash(void) |
50 | { | 50 | { |
51 | tagcache_rebuild(); | 51 | tagcache_rebuild(); |
52 | gui_syncsplash(HZ*2, true, str(LANG_TAGCACHE_FORCE_UPDATE_SPLASH)); | 52 | gui_syncsplash(HZ*2, str(LANG_TAGCACHE_FORCE_UPDATE_SPLASH)); |
53 | } | 53 | } |
54 | 54 | ||
55 | static void tagcache_update_with_splash(void) | 55 | static void tagcache_update_with_splash(void) |
56 | { | 56 | { |
57 | tagcache_update(); | 57 | tagcache_update(); |
58 | gui_syncsplash(HZ*2, true, str(LANG_TAGCACHE_FORCE_UPDATE_SPLASH)); | 58 | gui_syncsplash(HZ*2, str(LANG_TAGCACHE_FORCE_UPDATE_SPLASH)); |
59 | } | 59 | } |
60 | 60 | ||
61 | #ifdef HAVE_TC_RAMCACHE | 61 | #ifdef HAVE_TC_RAMCACHE |
@@ -163,7 +163,7 @@ static int dircache_callback(int action,const struct menu_item_ex *this_item) | |||
163 | { | 163 | { |
164 | case true: | 164 | case true: |
165 | if (!dircache_is_enabled()) | 165 | if (!dircache_is_enabled()) |
166 | gui_syncsplash(HZ*2, true, str(LANG_PLEASE_REBOOT)); | 166 | gui_syncsplash(HZ*2, str(LANG_PLEASE_REBOOT)); |
167 | break; | 167 | break; |
168 | case false: | 168 | case false: |
169 | if (dircache_is_enabled()) | 169 | if (dircache_is_enabled()) |
diff --git a/apps/misc.c b/apps/misc.c index 22f6fb50a6..57599de456 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -608,11 +608,11 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) | |||
608 | x5_backlight_shutdown(); | 608 | x5_backlight_shutdown(); |
609 | #endif | 609 | #endif |
610 | if (!battery_level_safe()) | 610 | if (!battery_level_safe()) |
611 | gui_syncsplash(3*HZ, true, "%s %s", | 611 | gui_syncsplash(3*HZ, "%s %s", |
612 | str(LANG_WARNING_BATTERY_EMPTY), | 612 | str(LANG_WARNING_BATTERY_EMPTY), |
613 | str(LANG_SHUTTINGDOWN)); | 613 | str(LANG_SHUTTINGDOWN)); |
614 | else if (battery_level_critical()) | 614 | else if (battery_level_critical()) |
615 | gui_syncsplash(3*HZ, true, "%s %s", | 615 | gui_syncsplash(3*HZ, "%s %s", |
616 | str(LANG_WARNING_BATTERY_LOW), | 616 | str(LANG_WARNING_BATTERY_LOW), |
617 | str(LANG_SHUTTINGDOWN)); | 617 | str(LANG_SHUTTINGDOWN)); |
618 | else { | 618 | else { |
@@ -620,11 +620,11 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) | |||
620 | if (!tagcache_prepare_shutdown()) | 620 | if (!tagcache_prepare_shutdown()) |
621 | { | 621 | { |
622 | cancel_shutdown(); | 622 | cancel_shutdown(); |
623 | gui_syncsplash(HZ, true, str(LANG_TAGCACHE_BUSY)); | 623 | gui_syncsplash(HZ, str(LANG_TAGCACHE_BUSY)); |
624 | return false; | 624 | return false; |
625 | } | 625 | } |
626 | #endif | 626 | #endif |
627 | gui_syncsplash(0, true, str(LANG_SHUTTINGDOWN)); | 627 | gui_syncsplash(0, str(LANG_SHUTTINGDOWN)); |
628 | } | 628 | } |
629 | 629 | ||
630 | if (global_settings.fade_on_stop | 630 | if (global_settings.fade_on_stop |
diff --git a/apps/onplay.c b/apps/onplay.c index a0da3ac2d9..be9f2d0703 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -141,7 +141,7 @@ static bool list_viewers(void) | |||
141 | else | 141 | else |
142 | { | 142 | { |
143 | /* FIX: translation! */ | 143 | /* FIX: translation! */ |
144 | gui_syncsplash(HZ*2, true, (unsigned char *)"No viewers found"); | 144 | gui_syncsplash(HZ*2, (unsigned char *)"No viewers found"); |
145 | } | 145 | } |
146 | 146 | ||
147 | if (ret == PLUGIN_USB_CONNECTED) | 147 | if (ret == PLUGIN_USB_CONNECTED) |
@@ -173,7 +173,7 @@ static bool add_to_playlist(int position, bool queue) | |||
173 | }; | 173 | }; |
174 | struct text_message message={lines, 2}; | 174 | struct text_message message={lines, 2}; |
175 | 175 | ||
176 | gui_syncsplash(0, true, str(LANG_WAIT)); | 176 | gui_syncsplash(0, str(LANG_WAIT)); |
177 | 177 | ||
178 | if (new_playlist) | 178 | if (new_playlist) |
179 | playlist_create(NULL, NULL); | 179 | playlist_create(NULL, NULL); |
@@ -454,7 +454,7 @@ static int remove_dir(char* dirname, int len) | |||
454 | #endif | 454 | #endif |
455 | if(ACTION_STD_CANCEL == get_action(CONTEXT_STD,TIMEOUT_NOBLOCK)) | 455 | if(ACTION_STD_CANCEL == get_action(CONTEXT_STD,TIMEOUT_NOBLOCK)) |
456 | { | 456 | { |
457 | gui_syncsplash(HZ, true, str(LANG_MENU_SETTING_CANCEL)); | 457 | gui_syncsplash(HZ, str(LANG_MENU_SETTING_CANCEL)); |
458 | result = -1; | 458 | result = -1; |
459 | break; | 459 | break; |
460 | } | 460 | } |
@@ -522,12 +522,12 @@ static bool set_backdrop(void) | |||
522 | { | 522 | { |
523 | /* load the image */ | 523 | /* load the image */ |
524 | if(load_main_backdrop(selected_file)) { | 524 | if(load_main_backdrop(selected_file)) { |
525 | gui_syncsplash(HZ, true, str(LANG_BACKDROP_LOADED)); | 525 | gui_syncsplash(HZ, str(LANG_BACKDROP_LOADED)); |
526 | set_file(selected_file, (char *)global_settings.backdrop_file, MAX_FILENAME); | 526 | set_file(selected_file, (char *)global_settings.backdrop_file, MAX_FILENAME); |
527 | show_main_backdrop(); | 527 | show_main_backdrop(); |
528 | return true; | 528 | return true; |
529 | } else { | 529 | } else { |
530 | gui_syncsplash(HZ, true, str(LANG_BACKDROP_FAILED)); | 530 | gui_syncsplash(HZ, str(LANG_BACKDROP_FAILED)); |
531 | return false; | 531 | return false; |
532 | } | 532 | } |
533 | } | 533 | } |
@@ -575,7 +575,7 @@ static bool create_dir(void) | |||
575 | 575 | ||
576 | rc = mkdir(dirname); | 576 | rc = mkdir(dirname); |
577 | if (rc < 0) { | 577 | if (rc < 0) { |
578 | gui_syncsplash(HZ, true, (unsigned char *)"%s %s", | 578 | gui_syncsplash(HZ, (unsigned char *)"%s %s", |
579 | str(LANG_CREATE_DIR), str(LANG_FAILED)); | 579 | str(LANG_CREATE_DIR), str(LANG_FAILED)); |
580 | } else { | 580 | } else { |
581 | onplay_result = ONPLAY_RELOAD_DIR; | 581 | onplay_result = ONPLAY_RELOAD_DIR; |
@@ -849,7 +849,7 @@ static bool clipboard_paste(void) | |||
849 | /* Force reload of the current directory */ | 849 | /* Force reload of the current directory */ |
850 | onplay_result = ONPLAY_RELOAD_DIR; | 850 | onplay_result = ONPLAY_RELOAD_DIR; |
851 | } else { | 851 | } else { |
852 | gui_syncsplash(HZ, true, (unsigned char *)"%s %s", | 852 | gui_syncsplash(HZ, (unsigned char *)"%s %s", |
853 | str(LANG_PASTE), str(LANG_FAILED)); | 853 | str(LANG_PASTE), str(LANG_FAILED)); |
854 | } | 854 | } |
855 | 855 | ||
diff --git a/apps/playback.c b/apps/playback.c index 0680c5f453..9676a107d0 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -820,7 +820,7 @@ void audio_set_crossfade(int enable) | |||
820 | offset = CUR_TI->id3.offset; | 820 | offset = CUR_TI->id3.offset; |
821 | 821 | ||
822 | /* Playback has to be stopped before changing the buffer size. */ | 822 | /* Playback has to be stopped before changing the buffer size. */ |
823 | gui_syncsplash(0, true, (char *)str(LANG_RESTARTING_PLAYBACK)); | 823 | gui_syncsplash(0, (char *)str(LANG_RESTARTING_PLAYBACK)); |
824 | audio_stop(); | 824 | audio_stop(); |
825 | } | 825 | } |
826 | 826 | ||
@@ -2006,7 +2006,7 @@ static void codec_thread(void) | |||
2006 | if (!ci.new_track) | 2006 | if (!ci.new_track) |
2007 | { | 2007 | { |
2008 | logf("Codec failure"); | 2008 | logf("Codec failure"); |
2009 | gui_syncsplash(HZ*2, true, "Codec failure"); | 2009 | gui_syncsplash(HZ*2, "Codec failure"); |
2010 | } | 2010 | } |
2011 | 2011 | ||
2012 | if (!codec_load_next_track()) | 2012 | if (!codec_load_next_track()) |
@@ -2060,7 +2060,7 @@ static void codec_thread(void) | |||
2060 | break; | 2060 | break; |
2061 | 2061 | ||
2062 | logf("Encoder failure"); | 2062 | logf("Encoder failure"); |
2063 | gui_syncsplash(HZ*2, true, "Encoder failure"); | 2063 | gui_syncsplash(HZ*2, "Encoder failure"); |
2064 | 2064 | ||
2065 | if (ci.enc_codec_loaded < 0) | 2065 | if (ci.enc_codec_loaded < 0) |
2066 | break; | 2066 | break; |
@@ -2742,7 +2742,7 @@ static bool audio_load_track(int offset, bool start_play, bool rebuffer) | |||
2742 | * the codec file failed part way through, either way, skip the track */ | 2742 | * the codec file failed part way through, either way, skip the track */ |
2743 | snprintf(msgbuf, sizeof(msgbuf)-1, "No codec for: %s", trackname); | 2743 | snprintf(msgbuf, sizeof(msgbuf)-1, "No codec for: %s", trackname); |
2744 | /* We should not use gui_syncplash from audio thread! */ | 2744 | /* We should not use gui_syncplash from audio thread! */ |
2745 | gui_syncsplash(HZ*2, true, msgbuf); | 2745 | gui_syncsplash(HZ*2, msgbuf); |
2746 | /* Skip invalid entry from playlist. */ | 2746 | /* Skip invalid entry from playlist. */ |
2747 | playlist_skip_entry(NULL, last_peek_offset); | 2747 | playlist_skip_entry(NULL, last_peek_offset); |
2748 | tracks[track_widx].taginfo_ready = false; | 2748 | tracks[track_widx].taginfo_ready = false; |
diff --git a/apps/playlist.c b/apps/playlist.c index 0358b6adc4..9d88e210f8 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
@@ -288,7 +288,7 @@ static void create_control(struct playlist_info* playlist) | |||
288 | { | 288 | { |
289 | if (check_rockboxdir()) | 289 | if (check_rockboxdir()) |
290 | { | 290 | { |
291 | gui_syncsplash(HZ*2, true, (unsigned char *)"%s (%d)", | 291 | gui_syncsplash(HZ*2, (unsigned char *)"%s (%d)", |
292 | str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR), | 292 | str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR), |
293 | playlist->control_fd); | 293 | playlist->control_fd); |
294 | } | 294 | } |
@@ -484,7 +484,7 @@ static int add_indices_to_playlist(struct playlist_info* playlist, | |||
484 | lcd_setmargins(0, 0); | 484 | lcd_setmargins(0, 0); |
485 | #endif | 485 | #endif |
486 | 486 | ||
487 | gui_syncsplash(0, true, str(LANG_PLAYLIST_LOAD)); | 487 | gui_syncsplash(0, str(LANG_PLAYLIST_LOAD)); |
488 | 488 | ||
489 | if (!buffer) | 489 | if (!buffer) |
490 | { | 490 | { |
@@ -1348,9 +1348,9 @@ static int get_filename(struct playlist_info* playlist, int index, int seek, | |||
1348 | if (max < 0) | 1348 | if (max < 0) |
1349 | { | 1349 | { |
1350 | if (control_file) | 1350 | if (control_file) |
1351 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); | 1351 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); |
1352 | else | 1352 | else |
1353 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_ACCESS_ERROR)); | 1353 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_ACCESS_ERROR)); |
1354 | 1354 | ||
1355 | return max; | 1355 | return max; |
1356 | } | 1356 | } |
@@ -1440,7 +1440,7 @@ static int get_next_dir(char *dir, bool is_forward, bool recursion) | |||
1440 | 1440 | ||
1441 | if (ft_load(tc, (dir[0]=='\0')?"/":dir) < 0) | 1441 | if (ft_load(tc, (dir[0]=='\0')?"/":dir) < 0) |
1442 | { | 1442 | { |
1443 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); | 1443 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); |
1444 | exit = true; | 1444 | exit = true; |
1445 | result = -1; | 1445 | result = -1; |
1446 | break; | 1446 | break; |
@@ -1525,7 +1525,7 @@ static int check_subdir_for_music(char *dir, char *subdir) | |||
1525 | 1525 | ||
1526 | if (ft_load(tc, dir) < 0) | 1526 | if (ft_load(tc, dir) < 0) |
1527 | { | 1527 | { |
1528 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); | 1528 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); |
1529 | return -2; | 1529 | return -2; |
1530 | } | 1530 | } |
1531 | 1531 | ||
@@ -1578,7 +1578,7 @@ static int check_subdir_for_music(char *dir, char *subdir) | |||
1578 | 1578 | ||
1579 | /* we now need to reload our current directory */ | 1579 | /* we now need to reload our current directory */ |
1580 | if(ft_load(tc, dir) < 0) | 1580 | if(ft_load(tc, dir) < 0) |
1581 | gui_syncsplash(HZ*2, true, | 1581 | gui_syncsplash(HZ*2, |
1582 | str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); | 1582 | str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); |
1583 | } | 1583 | } |
1584 | 1584 | ||
@@ -1663,7 +1663,7 @@ static void display_playlist_count(int count, const unsigned char *fmt) | |||
1663 | lcd_setmargins(0, 0); | 1663 | lcd_setmargins(0, 0); |
1664 | #endif | 1664 | #endif |
1665 | 1665 | ||
1666 | gui_syncsplash(0, true, fmt, count, | 1666 | gui_syncsplash(0, fmt, count, |
1667 | #if CONFIG_KEYPAD == PLAYER_PAD | 1667 | #if CONFIG_KEYPAD == PLAYER_PAD |
1668 | str(LANG_STOP_ABORT) | 1668 | str(LANG_STOP_ABORT) |
1669 | #else | 1669 | #else |
@@ -1677,7 +1677,7 @@ static void display_playlist_count(int count, const unsigned char *fmt) | |||
1677 | */ | 1677 | */ |
1678 | static void display_buffer_full(void) | 1678 | static void display_buffer_full(void) |
1679 | { | 1679 | { |
1680 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_BUFFER_FULL)); | 1680 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_BUFFER_FULL)); |
1681 | } | 1681 | } |
1682 | 1682 | ||
1683 | /* | 1683 | /* |
@@ -1756,7 +1756,7 @@ static int flush_cached_control(struct playlist_info* playlist) | |||
1756 | else | 1756 | else |
1757 | { | 1757 | { |
1758 | result = -1; | 1758 | result = -1; |
1759 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_UPDATE_ERROR)); | 1759 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_CONTROL_UPDATE_ERROR)); |
1760 | } | 1760 | } |
1761 | 1761 | ||
1762 | return result; | 1762 | return result; |
@@ -1943,11 +1943,11 @@ int playlist_resume(void) | |||
1943 | 1943 | ||
1944 | empty_playlist(playlist, true); | 1944 | empty_playlist(playlist, true); |
1945 | 1945 | ||
1946 | gui_syncsplash(0, true, str(LANG_WAIT)); | 1946 | gui_syncsplash(0, str(LANG_WAIT)); |
1947 | playlist->control_fd = open(playlist->control_filename, O_RDWR); | 1947 | playlist->control_fd = open(playlist->control_filename, O_RDWR); |
1948 | if (playlist->control_fd < 0) | 1948 | if (playlist->control_fd < 0) |
1949 | { | 1949 | { |
1950 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); | 1950 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); |
1951 | return -1; | 1951 | return -1; |
1952 | } | 1952 | } |
1953 | playlist->control_created = true; | 1953 | playlist->control_created = true; |
@@ -1955,7 +1955,7 @@ int playlist_resume(void) | |||
1955 | control_file_size = filesize(playlist->control_fd); | 1955 | control_file_size = filesize(playlist->control_fd); |
1956 | if (control_file_size <= 0) | 1956 | if (control_file_size <= 0) |
1957 | { | 1957 | { |
1958 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); | 1958 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); |
1959 | return -1; | 1959 | return -1; |
1960 | } | 1960 | } |
1961 | 1961 | ||
@@ -1964,7 +1964,7 @@ int playlist_resume(void) | |||
1964 | PLAYLIST_COMMAND_SIZE<buflen?PLAYLIST_COMMAND_SIZE:buflen); | 1964 | PLAYLIST_COMMAND_SIZE<buflen?PLAYLIST_COMMAND_SIZE:buflen); |
1965 | if(nread <= 0) | 1965 | if(nread <= 0) |
1966 | { | 1966 | { |
1967 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); | 1967 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); |
1968 | return -1; | 1968 | return -1; |
1969 | } | 1969 | } |
1970 | 1970 | ||
@@ -1990,7 +1990,7 @@ int playlist_resume(void) | |||
1990 | /* So a splash while we are loading. */ | 1990 | /* So a splash while we are loading. */ |
1991 | if (current_tick - last_tick > HZ/4) | 1991 | if (current_tick - last_tick > HZ/4) |
1992 | { | 1992 | { |
1993 | gui_syncsplash(0, true, str(LANG_LOADING_PERCENT), | 1993 | gui_syncsplash(0, str(LANG_LOADING_PERCENT), |
1994 | (total_read+count)*100/control_file_size, | 1994 | (total_read+count)*100/control_file_size, |
1995 | #if CONFIG_KEYPAD == PLAYER_PAD | 1995 | #if CONFIG_KEYPAD == PLAYER_PAD |
1996 | str(LANG_STOP_ABORT) | 1996 | str(LANG_STOP_ABORT) |
@@ -2264,7 +2264,7 @@ int playlist_resume(void) | |||
2264 | 2264 | ||
2265 | if (result < 0) | 2265 | if (result < 0) |
2266 | { | 2266 | { |
2267 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_INVALID)); | 2267 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_CONTROL_INVALID)); |
2268 | return result; | 2268 | return result; |
2269 | } | 2269 | } |
2270 | 2270 | ||
@@ -2273,7 +2273,7 @@ int playlist_resume(void) | |||
2273 | if ((total_read + count) >= control_file_size) | 2273 | if ((total_read + count) >= control_file_size) |
2274 | { | 2274 | { |
2275 | /* no newline at end of control file */ | 2275 | /* no newline at end of control file */ |
2276 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_INVALID)); | 2276 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_CONTROL_INVALID)); |
2277 | return -1; | 2277 | return -1; |
2278 | } | 2278 | } |
2279 | 2279 | ||
@@ -2367,7 +2367,7 @@ int playlist_shuffle(int random_seed, int start_index) | |||
2367 | start_current = true; | 2367 | start_current = true; |
2368 | } | 2368 | } |
2369 | 2369 | ||
2370 | gui_syncsplash(0, true, str(LANG_PLAYLIST_SHUFFLE)); | 2370 | gui_syncsplash(0, str(LANG_PLAYLIST_SHUFFLE)); |
2371 | 2371 | ||
2372 | randomise_playlist(playlist, random_seed, start_current, true); | 2372 | randomise_playlist(playlist, random_seed, start_current, true); |
2373 | 2373 | ||
@@ -2859,7 +2859,7 @@ int playlist_insert_track(struct playlist_info* playlist, const char *filename, | |||
2859 | 2859 | ||
2860 | if (check_control(playlist) < 0) | 2860 | if (check_control(playlist) < 0) |
2861 | { | 2861 | { |
2862 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); | 2862 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); |
2863 | return -1; | 2863 | return -1; |
2864 | } | 2864 | } |
2865 | 2865 | ||
@@ -2890,7 +2890,7 @@ int playlist_insert_directory(struct playlist_info* playlist, | |||
2890 | 2890 | ||
2891 | if (check_control(playlist) < 0) | 2891 | if (check_control(playlist) < 0) |
2892 | { | 2892 | { |
2893 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); | 2893 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); |
2894 | return -1; | 2894 | return -1; |
2895 | } | 2895 | } |
2896 | 2896 | ||
@@ -2956,14 +2956,14 @@ int playlist_insert_playlist(struct playlist_info* playlist, char *filename, | |||
2956 | 2956 | ||
2957 | if (check_control(playlist) < 0) | 2957 | if (check_control(playlist) < 0) |
2958 | { | 2958 | { |
2959 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); | 2959 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); |
2960 | return -1; | 2960 | return -1; |
2961 | } | 2961 | } |
2962 | 2962 | ||
2963 | fd = open(filename, O_RDONLY); | 2963 | fd = open(filename, O_RDONLY); |
2964 | if (fd < 0) | 2964 | if (fd < 0) |
2965 | { | 2965 | { |
2966 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_ACCESS_ERROR)); | 2966 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_ACCESS_ERROR)); |
2967 | return -1; | 2967 | return -1; |
2968 | } | 2968 | } |
2969 | 2969 | ||
@@ -3076,7 +3076,7 @@ int playlist_delete(struct playlist_info* playlist, int index) | |||
3076 | 3076 | ||
3077 | if (check_control(playlist) < 0) | 3077 | if (check_control(playlist) < 0) |
3078 | { | 3078 | { |
3079 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); | 3079 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); |
3080 | return -1; | 3080 | return -1; |
3081 | } | 3081 | } |
3082 | 3082 | ||
@@ -3111,7 +3111,7 @@ int playlist_move(struct playlist_info* playlist, int index, int new_index) | |||
3111 | 3111 | ||
3112 | if (check_control(playlist) < 0) | 3112 | if (check_control(playlist) < 0) |
3113 | { | 3113 | { |
3114 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); | 3114 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); |
3115 | return -1; | 3115 | return -1; |
3116 | } | 3116 | } |
3117 | 3117 | ||
@@ -3374,7 +3374,7 @@ int playlist_save(struct playlist_info* playlist, char *filename) | |||
3374 | if (playlist->buffer_size < (int)(playlist->amount * sizeof(int))) | 3374 | if (playlist->buffer_size < (int)(playlist->amount * sizeof(int))) |
3375 | { | 3375 | { |
3376 | /* not enough buffer space to store updated indices */ | 3376 | /* not enough buffer space to store updated indices */ |
3377 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_ACCESS_ERROR)); | 3377 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_ACCESS_ERROR)); |
3378 | return -1; | 3378 | return -1; |
3379 | } | 3379 | } |
3380 | 3380 | ||
@@ -3390,7 +3390,7 @@ int playlist_save(struct playlist_info* playlist, char *filename) | |||
3390 | fd = open(path, O_CREAT|O_WRONLY|O_TRUNC); | 3390 | fd = open(path, O_CREAT|O_WRONLY|O_TRUNC); |
3391 | if (fd < 0) | 3391 | if (fd < 0) |
3392 | { | 3392 | { |
3393 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_ACCESS_ERROR)); | 3393 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_ACCESS_ERROR)); |
3394 | return -1; | 3394 | return -1; |
3395 | } | 3395 | } |
3396 | 3396 | ||
@@ -3431,7 +3431,7 @@ int playlist_save(struct playlist_info* playlist, char *filename) | |||
3431 | 3431 | ||
3432 | if (fdprintf(fd, "%s\n", tmp_buf) < 0) | 3432 | if (fdprintf(fd, "%s\n", tmp_buf) < 0) |
3433 | { | 3433 | { |
3434 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_ACCESS_ERROR)); | 3434 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_ACCESS_ERROR)); |
3435 | result = -1; | 3435 | result = -1; |
3436 | break; | 3436 | break; |
3437 | } | 3437 | } |
@@ -3518,7 +3518,7 @@ int playlist_directory_tracksearch(const char* dirname, bool recurse, | |||
3518 | 3518 | ||
3519 | if (ft_load(tc, dirname) < 0) | 3519 | if (ft_load(tc, dirname) < 0) |
3520 | { | 3520 | { |
3521 | gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); | 3521 | gui_syncsplash(HZ*2, str(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR)); |
3522 | *(tc->dirfilter) = old_dirfilter; | 3522 | *(tc->dirfilter) = old_dirfilter; |
3523 | return -1; | 3523 | return -1; |
3524 | } | 3524 | } |
diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c index d0602991e4..1e3d523181 100644 --- a/apps/playlist_catalog.c +++ b/apps/playlist_catalog.c | |||
@@ -112,7 +112,7 @@ static int initialize_catalog(void) | |||
112 | if (!playlist_dir_exists) | 112 | if (!playlist_dir_exists) |
113 | { | 113 | { |
114 | if (mkdir(playlist_dir) < 0) { | 114 | if (mkdir(playlist_dir) < 0) { |
115 | gui_syncsplash(HZ*2, true, str(LANG_CATALOG_NO_DIRECTORY), | 115 | gui_syncsplash(HZ*2, str(LANG_CATALOG_NO_DIRECTORY), |
116 | playlist_dir); | 116 | playlist_dir); |
117 | return -1; | 117 | return -1; |
118 | } | 118 | } |
@@ -146,7 +146,7 @@ static int create_playlist_list(char** playlists, int num_items, | |||
146 | 146 | ||
147 | if (ft_load(tc, playlist_dir) < 0) | 147 | if (ft_load(tc, playlist_dir) < 0) |
148 | { | 148 | { |
149 | gui_syncsplash(HZ*2, true, str(LANG_CATALOG_NO_DIRECTORY), | 149 | gui_syncsplash(HZ*2, str(LANG_CATALOG_NO_DIRECTORY), |
150 | playlist_dir); | 150 | playlist_dir); |
151 | goto exit; | 151 | goto exit; |
152 | } | 152 | } |
@@ -231,7 +231,7 @@ static int display_playlists(char* playlist, bool view) | |||
231 | 231 | ||
232 | if (num_playlists <= 0) | 232 | if (num_playlists <= 0) |
233 | { | 233 | { |
234 | gui_syncsplash(HZ*2, true, str(LANG_CATALOG_NO_PLAYLISTS)); | 234 | gui_syncsplash(HZ*2, str(LANG_CATALOG_NO_PLAYLISTS)); |
235 | return -1; | 235 | return -1; |
236 | } | 236 | } |
237 | 237 | ||
@@ -319,7 +319,7 @@ static int display_playlists(char* playlist, bool view) | |||
319 | insert */ | 319 | insert */ |
320 | static void display_insert_count(int count) | 320 | static void display_insert_count(int count) |
321 | { | 321 | { |
322 | gui_syncsplash(0, true, str(LANG_PLAYLIST_INSERT_COUNT), count, | 322 | gui_syncsplash(0, str(LANG_PLAYLIST_INSERT_COUNT), count, |
323 | #if CONFIG_KEYPAD == PLAYER_PAD | 323 | #if CONFIG_KEYPAD == PLAYER_PAD |
324 | str(LANG_STOP_ABORT) | 324 | str(LANG_STOP_ABORT) |
325 | #else | 325 | #else |
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 0b77386de0..3336645520 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -636,9 +636,9 @@ bool playlist_viewer_ex(char* filename) | |||
636 | { | 636 | { |
637 | /* Play has stopped */ | 637 | /* Play has stopped */ |
638 | #ifdef HAVE_LCD_CHARCELLS | 638 | #ifdef HAVE_LCD_CHARCELLS |
639 | gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST_PLAYER)); | 639 | gui_syncsplash(HZ, str(LANG_END_PLAYLIST_PLAYER)); |
640 | #else | 640 | #else |
641 | gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST_RECORDER)); | 641 | gui_syncsplash(HZ, str(LANG_END_PLAYLIST_RECORDER)); |
642 | #endif | 642 | #endif |
643 | goto exit; | 643 | goto exit; |
644 | } | 644 | } |
@@ -696,7 +696,7 @@ bool playlist_viewer_ex(char* filename) | |||
696 | ret = playlist_move(viewer.playlist, viewer.move_track, | 696 | ret = playlist_move(viewer.playlist, viewer.move_track, |
697 | current_track->index); | 697 | current_track->index); |
698 | if (ret < 0) | 698 | if (ret < 0) |
699 | gui_syncsplash(HZ, true, str(LANG_MOVE_FAILED)); | 699 | gui_syncsplash(HZ, str(LANG_MOVE_FAILED)); |
700 | 700 | ||
701 | update_playlist(true); | 701 | update_playlist(true); |
702 | viewer.move_track = -1; | 702 | viewer.move_track = -1; |
@@ -819,7 +819,7 @@ bool search_playlist(void) | |||
819 | playlist_count = playlist_amount_ex(viewer.playlist); | 819 | playlist_count = playlist_amount_ex(viewer.playlist); |
820 | for (i=0;(i<playlist_count)&&(found_indicies_count<MAX_PLAYLIST_ENTRIES);i++) | 820 | for (i=0;(i<playlist_count)&&(found_indicies_count<MAX_PLAYLIST_ENTRIES);i++) |
821 | { | 821 | { |
822 | gui_syncsplash(0, true, str(LANG_PLAYLIST_SEARCH_MSG),found_indicies_count, | 822 | gui_syncsplash(0, str(LANG_PLAYLIST_SEARCH_MSG),found_indicies_count, |
823 | #if CONFIG_KEYPAD == PLAYER_PAD | 823 | #if CONFIG_KEYPAD == PLAYER_PAD |
824 | str(LANG_STOP_ABORT) | 824 | str(LANG_STOP_ABORT) |
825 | #else | 825 | #else |
diff --git a/apps/plugin.c b/apps/plugin.c index 5fc837f656..1a5ee4e3f7 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -526,32 +526,32 @@ int plugin_load(const char* plugin, void* parameter) | |||
526 | plugin_loaded = false; | 526 | plugin_loaded = false; |
527 | } | 527 | } |
528 | 528 | ||
529 | gui_syncsplash(0, true, str(LANG_WAIT)); | 529 | gui_syncsplash(0, str(LANG_WAIT)); |
530 | strcpy(current_plugin,p); | 530 | strcpy(current_plugin,p); |
531 | 531 | ||
532 | #ifdef SIMULATOR | 532 | #ifdef SIMULATOR |
533 | hdr = sim_plugin_load((char *)plugin, &pd); | 533 | hdr = sim_plugin_load((char *)plugin, &pd); |
534 | if (pd == NULL) { | 534 | if (pd == NULL) { |
535 | gui_syncsplash(HZ*2, true, str(LANG_PLUGIN_CANT_OPEN), plugin); | 535 | gui_syncsplash(HZ*2, str(LANG_PLUGIN_CANT_OPEN), plugin); |
536 | return -1; | 536 | return -1; |
537 | } | 537 | } |
538 | if (hdr == NULL | 538 | if (hdr == NULL |
539 | || hdr->magic != PLUGIN_MAGIC | 539 | || hdr->magic != PLUGIN_MAGIC |
540 | || hdr->target_id != TARGET_ID) { | 540 | || hdr->target_id != TARGET_ID) { |
541 | sim_plugin_close(pd); | 541 | sim_plugin_close(pd); |
542 | gui_syncsplash(HZ*2, true, str(LANG_PLUGIN_WRONG_MODEL)); | 542 | gui_syncsplash(HZ*2, str(LANG_PLUGIN_WRONG_MODEL)); |
543 | return -1; | 543 | return -1; |
544 | } | 544 | } |
545 | if (hdr->api_version > PLUGIN_API_VERSION | 545 | if (hdr->api_version > PLUGIN_API_VERSION |
546 | || hdr->api_version < PLUGIN_MIN_API_VERSION) { | 546 | || hdr->api_version < PLUGIN_MIN_API_VERSION) { |
547 | sim_plugin_close(pd); | 547 | sim_plugin_close(pd); |
548 | gui_syncsplash(HZ*2, true, str(LANG_PLUGIN_WRONG_VERSION)); | 548 | gui_syncsplash(HZ*2, str(LANG_PLUGIN_WRONG_VERSION)); |
549 | return -1; | 549 | return -1; |
550 | } | 550 | } |
551 | #else | 551 | #else |
552 | fd = open(plugin, O_RDONLY); | 552 | fd = open(plugin, O_RDONLY); |
553 | if (fd < 0) { | 553 | if (fd < 0) { |
554 | gui_syncsplash(HZ*2, true, str(LANG_PLUGIN_CANT_OPEN), plugin); | 554 | gui_syncsplash(HZ*2, str(LANG_PLUGIN_CANT_OPEN), plugin); |
555 | return fd; | 555 | return fd; |
556 | } | 556 | } |
557 | 557 | ||
@@ -559,7 +559,7 @@ int plugin_load(const char* plugin, void* parameter) | |||
559 | close(fd); | 559 | close(fd); |
560 | 560 | ||
561 | if (readsize < 0) { | 561 | if (readsize < 0) { |
562 | gui_syncsplash(HZ*2, true, str(LANG_READ_FAILED), plugin); | 562 | gui_syncsplash(HZ*2, str(LANG_READ_FAILED), plugin); |
563 | return -1; | 563 | return -1; |
564 | } | 564 | } |
565 | hdr = (struct plugin_header *)pluginbuf; | 565 | hdr = (struct plugin_header *)pluginbuf; |
@@ -569,12 +569,12 @@ int plugin_load(const char* plugin, void* parameter) | |||
569 | || hdr->target_id != TARGET_ID | 569 | || hdr->target_id != TARGET_ID |
570 | || hdr->load_addr != pluginbuf | 570 | || hdr->load_addr != pluginbuf |
571 | || hdr->end_addr > pluginbuf + PLUGIN_BUFFER_SIZE) { | 571 | || hdr->end_addr > pluginbuf + PLUGIN_BUFFER_SIZE) { |
572 | gui_syncsplash(HZ*2, true, str(LANG_PLUGIN_WRONG_MODEL)); | 572 | gui_syncsplash(HZ*2, str(LANG_PLUGIN_WRONG_MODEL)); |
573 | return -1; | 573 | return -1; |
574 | } | 574 | } |
575 | if (hdr->api_version > PLUGIN_API_VERSION | 575 | if (hdr->api_version > PLUGIN_API_VERSION |
576 | || hdr->api_version < PLUGIN_MIN_API_VERSION) { | 576 | || hdr->api_version < PLUGIN_MIN_API_VERSION) { |
577 | gui_syncsplash(HZ*2, true, str(LANG_PLUGIN_WRONG_VERSION)); | 577 | gui_syncsplash(HZ*2, str(LANG_PLUGIN_WRONG_VERSION)); |
578 | return -1; | 578 | return -1; |
579 | } | 579 | } |
580 | plugin_size = hdr->end_addr - pluginbuf; | 580 | plugin_size = hdr->end_addr - pluginbuf; |
@@ -659,7 +659,7 @@ int plugin_load(const char* plugin, void* parameter) | |||
659 | return PLUGIN_USB_CONNECTED; | 659 | return PLUGIN_USB_CONNECTED; |
660 | 660 | ||
661 | default: | 661 | default: |
662 | gui_syncsplash(HZ*2, true, str(LANG_PLUGIN_ERROR)); | 662 | gui_syncsplash(HZ*2, str(LANG_PLUGIN_ERROR)); |
663 | break; | 663 | break; |
664 | } | 664 | } |
665 | return PLUGIN_OK; | 665 | return PLUGIN_OK; |
diff --git a/apps/plugin.h b/apps/plugin.h index e16959681c..c0e04a2068 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -205,7 +205,7 @@ struct plugin_api { | |||
205 | void (*backlight_on)(void); | 205 | void (*backlight_on)(void); |
206 | void (*backlight_off)(void); | 206 | void (*backlight_off)(void); |
207 | void (*backlight_set_timeout)(int index); | 207 | void (*backlight_set_timeout)(int index); |
208 | void (*splash)(int ticks, bool center, const unsigned char *fmt, ...); | 208 | void (*splash)(int ticks, const unsigned char *fmt, ...); |
209 | 209 | ||
210 | #ifdef HAVE_REMOTE_LCD | 210 | #ifdef HAVE_REMOTE_LCD |
211 | /* remote lcd */ | 211 | /* remote lcd */ |
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c index 9cc1f9cde4..4fa2e36f54 100644 --- a/apps/plugins/alpine_cdc.c +++ b/apps/plugins/alpine_cdc.c | |||
@@ -1151,7 +1151,7 @@ int main(void* parameter) | |||
1151 | mbus_init(); /* init the M-Bus layer */ | 1151 | mbus_init(); /* init the M-Bus layer */ |
1152 | emu_init(); /* init emulator */ | 1152 | emu_init(); /* init emulator */ |
1153 | 1153 | ||
1154 | rb->splash(HZ/5, true, "Alpine CDC"); /* be quick on autostart */ | 1154 | rb->splash(HZ/5, "Alpine CDC"); /* be quick on autostart */ |
1155 | 1155 | ||
1156 | #ifdef DEBUG | 1156 | #ifdef DEBUG |
1157 | print_scroll("Alpine M-Bus Test"); | 1157 | print_scroll("Alpine M-Bus Test"); |
@@ -1164,7 +1164,7 @@ int main(void* parameter) | |||
1164 | stacksize = (stacksize - 100) & ~3; | 1164 | stacksize = (stacksize - 100) & ~3; |
1165 | if (stacksize < DEFAULT_STACK_SIZE) | 1165 | if (stacksize < DEFAULT_STACK_SIZE) |
1166 | { | 1166 | { |
1167 | rb->splash(HZ*2, true, "Out of memory"); | 1167 | rb->splash(HZ*2, "Out of memory"); |
1168 | return -1; | 1168 | return -1; |
1169 | } | 1169 | } |
1170 | 1170 | ||
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 6e3178237f..b82fdef965 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -320,7 +320,7 @@ void thread(void) | |||
320 | if(exit) | 320 | if(exit) |
321 | { | 321 | { |
322 | if(exit == 2) | 322 | if(exit == 2) |
323 | rb->splash(HZ,true, | 323 | rb->splash(HZ, |
324 | #ifdef HAVE_LCD_BITMAP | 324 | #ifdef HAVE_LCD_BITMAP |
325 | "Exiting battery_bench..."); | 325 | "Exiting battery_bench..."); |
326 | #else | 326 | #else |
@@ -464,7 +464,7 @@ int main(void) | |||
464 | } | 464 | } |
465 | else | 465 | else |
466 | { | 466 | { |
467 | rb->splash(HZ / 2, true, "Cannot create file!"); | 467 | rb->splash(HZ / 2, "Cannot create file!"); |
468 | return PLUGIN_ERROR; | 468 | return PLUGIN_ERROR; |
469 | } | 469 | } |
470 | } | 470 | } |
@@ -482,7 +482,7 @@ int main(void) | |||
482 | IF_PRIO(, PRIORITY_BACKGROUND) | 482 | IF_PRIO(, PRIORITY_BACKGROUND) |
483 | IF_COP(, CPU, false)) == NULL) | 483 | IF_COP(, CPU, false)) == NULL) |
484 | { | 484 | { |
485 | rb->splash(HZ,true,"Cannot create thread!"); | 485 | rb->splash(HZ, "Cannot create thread!"); |
486 | return PLUGIN_ERROR; | 486 | return PLUGIN_ERROR; |
487 | } | 487 | } |
488 | 488 | ||
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 728924da3e..81ac65d142 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -712,7 +712,7 @@ static void blackjack_savegame(struct game_context* bj) { | |||
712 | static void blackjack_callback(void* param) { | 712 | static void blackjack_callback(void* param) { |
713 | struct game_context* bj = (struct game_context*) param; | 713 | struct game_context* bj = (struct game_context*) param; |
714 | if(bj->dirty) { | 714 | if(bj->dirty) { |
715 | rb->splash(HZ, true, "Saving high scores..."); | 715 | rb->splash(HZ, "Saving high scores..."); |
716 | blackjack_savescores(bj); | 716 | blackjack_savescores(bj); |
717 | } | 717 | } |
718 | } | 718 | } |
@@ -1124,9 +1124,9 @@ static unsigned int blackjack_menu(struct game_context* bj) { | |||
1124 | 1124 | ||
1125 | case BJACK_RESUME:/* resume game */ | 1125 | case BJACK_RESUME:/* resume game */ |
1126 | if(!blackjack_loadgame(bj)) { | 1126 | if(!blackjack_loadgame(bj)) { |
1127 | rb->splash(HZ*2, true, "Nothing to resume"); | 1127 | rb->splash(HZ*2, "Nothing to resume"); |
1128 | } else { | 1128 | } else { |
1129 | rb->splash(HZ*2, true, "Loading..."); | 1129 | rb->splash(HZ*2, "Loading..."); |
1130 | breakout = true; | 1130 | breakout = true; |
1131 | } | 1131 | } |
1132 | break; | 1132 | break; |
@@ -1218,7 +1218,7 @@ static int blackjack(struct game_context* bj) { | |||
1218 | !bj->asked_insurance) { | 1218 | !bj->asked_insurance) { |
1219 | temp_var = insurance(bj); | 1219 | temp_var = insurance(bj); |
1220 | if (bj->dealer_total == 21) { | 1220 | if (bj->dealer_total == 21) { |
1221 | rb->splash(HZ, true, "Dealer has blackjack"); | 1221 | rb->splash(HZ, "Dealer has blackjack"); |
1222 | bj->player_money += temp_var; | 1222 | bj->player_money += temp_var; |
1223 | bj->end_hand = true; | 1223 | bj->end_hand = true; |
1224 | breakout = true; | 1224 | breakout = true; |
@@ -1226,7 +1226,7 @@ static int blackjack(struct game_context* bj) { | |||
1226 | finish_game(bj); | 1226 | finish_game(bj); |
1227 | } | 1227 | } |
1228 | else { | 1228 | else { |
1229 | rb->splash(HZ, true, "Dealer does not have blackjack"); | 1229 | rb->splash(HZ, "Dealer does not have blackjack"); |
1230 | bj->player_money -= temp_var; | 1230 | bj->player_money -= temp_var; |
1231 | breakout = true; | 1231 | breakout = true; |
1232 | redraw_board(bj); | 1232 | redraw_board(bj); |
@@ -1285,13 +1285,13 @@ static int blackjack(struct game_context* bj) { | |||
1285 | } | 1285 | } |
1286 | } | 1286 | } |
1287 | else if((signed int)bj->current_bet * 2 > bj->player_money) { | 1287 | else if((signed int)bj->current_bet * 2 > bj->player_money) { |
1288 | rb->splash(HZ, true, "Not enough money to double down."); | 1288 | rb->splash(HZ, "Not enough money to double down."); |
1289 | redraw_board(bj); | 1289 | redraw_board(bj); |
1290 | rb->lcd_update(); | 1290 | rb->lcd_update(); |
1291 | } | 1291 | } |
1292 | break; | 1292 | break; |
1293 | case BJACK_RESUME: /* save and end game */ | 1293 | case BJACK_RESUME: /* save and end game */ |
1294 | rb->splash(HZ, true, "Saving game..."); | 1294 | rb->splash(HZ, "Saving game..."); |
1295 | blackjack_savegame(bj); | 1295 | blackjack_savegame(bj); |
1296 | /* fall through to BJACK_QUIT */ | 1296 | /* fall through to BJACK_QUIT */ |
1297 | 1297 | ||
@@ -1412,14 +1412,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
1412 | while(!exit) { | 1412 | while(!exit) { |
1413 | switch(blackjack(&bj)){ | 1413 | switch(blackjack(&bj)){ |
1414 | case BJ_LOSE: | 1414 | case BJ_LOSE: |
1415 | rb->splash(HZ, true, "Not enough money to continue"); | 1415 | rb->splash(HZ, "Not enough money to continue"); |
1416 | /* fall through to BJ_END */ | 1416 | /* fall through to BJ_END */ |
1417 | 1417 | ||
1418 | case BJ_END: | 1418 | case BJ_END: |
1419 | if(!bj.resume) { | 1419 | if(!bj.resume) { |
1420 | if((position = blackjack_recordscore(&bj))) { | 1420 | if((position = blackjack_recordscore(&bj))) { |
1421 | rb->snprintf(str, 19, "New high score #%d!", position); | 1421 | rb->snprintf(str, 19, "New high score #%d!", position); |
1422 | rb->splash(HZ*2, true, str); | 1422 | rb->splash(HZ*2, str); |
1423 | } | 1423 | } |
1424 | } | 1424 | } |
1425 | break; | 1425 | break; |
@@ -1430,7 +1430,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
1430 | 1430 | ||
1431 | case BJ_QUIT: | 1431 | case BJ_QUIT: |
1432 | if(bj.dirty) { | 1432 | if(bj.dirty) { |
1433 | rb->splash(HZ, true, "Saving high scores..."); | 1433 | rb->splash(HZ, "Saving high scores..."); |
1434 | blackjack_savescores(&bj); | 1434 | blackjack_savescores(&bj); |
1435 | } | 1435 | } |
1436 | exit = true; | 1436 | exit = true; |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index c88ee77cd0..2f1696f08a 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -1804,7 +1804,7 @@ int game_loop(void) | |||
1804 | if (score>highscore) { | 1804 | if (score>highscore) { |
1805 | sleep(2); | 1805 | sleep(2); |
1806 | highscore=score; | 1806 | highscore=score; |
1807 | rb->splash(HZ*2,true,"New High Score"); | 1807 | rb->splash(HZ*2, "New High Score"); |
1808 | } | 1808 | } |
1809 | else { | 1809 | else { |
1810 | sleep(3); | 1810 | sleep(3); |
@@ -1960,7 +1960,7 @@ int game_loop(void) | |||
1960 | } | 1960 | } |
1961 | else { | 1961 | else { |
1962 | #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) | 1962 | #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) |
1963 | rb->splash(HZ*2,true,"Game Over"); | 1963 | rb->splash(HZ*2, "Game Over"); |
1964 | #else | 1964 | #else |
1965 | rb->lcd_bitmap(brickmania_gameover,LCD_WIDTH/2-55,LCD_HEIGHT-87, | 1965 | rb->lcd_bitmap(brickmania_gameover,LCD_WIDTH/2-55,LCD_HEIGHT-87, |
1966 | 110,52); | 1966 | 110,52); |
@@ -1969,7 +1969,7 @@ int game_loop(void) | |||
1969 | if (score>highscore) { | 1969 | if (score>highscore) { |
1970 | sleep(2); | 1970 | sleep(2); |
1971 | highscore=score; | 1971 | highscore=score; |
1972 | rb->splash(HZ*2,true,"New High Score"); | 1972 | rb->splash(HZ*2, "New High Score"); |
1973 | } else { | 1973 | } else { |
1974 | sleep(3); | 1974 | sleep(3); |
1975 | } | 1975 | } |
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 1f5b319e72..bc862baeda 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -2164,7 +2164,7 @@ static int bubbles_checklevel(struct game_context* bb) { | |||
2164 | } | 2164 | } |
2165 | 2165 | ||
2166 | rb->snprintf(str, 12, "%d points", points); | 2166 | rb->snprintf(str, 12, "%d points", points); |
2167 | rb->splash(HZ, true, str); | 2167 | rb->splash(HZ, str); |
2168 | 2168 | ||
2169 | /* advance to the next level */ | 2169 | /* advance to the next level */ |
2170 | if(!bubbles_nextlevel(bb)) { | 2170 | if(!bubbles_nextlevel(bb)) { |
@@ -2174,7 +2174,7 @@ static int bubbles_checklevel(struct game_context* bb) { | |||
2174 | bubbles_drawboard(bb); | 2174 | bubbles_drawboard(bb); |
2175 | rb->lcd_update(); | 2175 | rb->lcd_update(); |
2176 | rb->snprintf(str, 12, "Level %d", bb->level); | 2176 | rb->snprintf(str, 12, "Level %d", bb->level); |
2177 | rb->splash(HZ, true, str); | 2177 | rb->splash(HZ, str); |
2178 | bubbles_drawboard(bb); | 2178 | bubbles_drawboard(bb); |
2179 | rb->lcd_update(); | 2179 | rb->lcd_update(); |
2180 | 2180 | ||
@@ -2334,7 +2334,7 @@ static inline void bubbles_setcolors(void) { | |||
2334 | static void bubbles_callback(void* param) { | 2334 | static void bubbles_callback(void* param) { |
2335 | struct game_context* bb = (struct game_context*) param; | 2335 | struct game_context* bb = (struct game_context*) param; |
2336 | if(bb->dirty) { | 2336 | if(bb->dirty) { |
2337 | rb->splash(HZ/2, true, "Saving high scores..."); | 2337 | rb->splash(HZ/2, "Saving high scores..."); |
2338 | bubbles_savescores(bb); | 2338 | bubbles_savescores(bb); |
2339 | } | 2339 | } |
2340 | } | 2340 | } |
@@ -2385,7 +2385,7 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock, | |||
2385 | 2385 | ||
2386 | case BUBBLES_START: /* pause the game */ | 2386 | case BUBBLES_START: /* pause the game */ |
2387 | start = *rb->current_tick; | 2387 | start = *rb->current_tick; |
2388 | rb->splash(1, true, "Paused"); | 2388 | rb->splash(1, "Paused"); |
2389 | while(pluginlib_getaction(rb,TIMEOUT_BLOCK,plugin_contexts,2) | 2389 | while(pluginlib_getaction(rb,TIMEOUT_BLOCK,plugin_contexts,2) |
2390 | != (BUBBLES_START)); | 2390 | != (BUBBLES_START)); |
2391 | bb->startedshot += *rb->current_tick-start; | 2391 | bb->startedshot += *rb->current_tick-start; |
@@ -2395,7 +2395,7 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock, | |||
2395 | 2395 | ||
2396 | case BUBBLES_RESUME: /* save and end the game */ | 2396 | case BUBBLES_RESUME: /* save and end the game */ |
2397 | if(!animblock) { | 2397 | if(!animblock) { |
2398 | rb->splash(HZ/2, true, "Saving game..."); | 2398 | rb->splash(HZ/2, "Saving game..."); |
2399 | bubbles_savegame(bb); | 2399 | bubbles_savegame(bb); |
2400 | return BB_END; | 2400 | return BB_END; |
2401 | } | 2401 | } |
@@ -2554,7 +2554,7 @@ static int bubbles(struct game_context* bb) { | |||
2554 | 2554 | ||
2555 | case BUBBLES_RESUME: /* resume game */ | 2555 | case BUBBLES_RESUME: /* resume game */ |
2556 | if(!bubbles_loadgame(bb)) { | 2556 | if(!bubbles_loadgame(bb)) { |
2557 | rb->splash(HZ*2, true, "Nothing to resume"); | 2557 | rb->splash(HZ*2, "Nothing to resume"); |
2558 | } else { | 2558 | } else { |
2559 | startgame = true; | 2559 | startgame = true; |
2560 | } | 2560 | } |
@@ -2652,7 +2652,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
2652 | xlcd_init(rb); | 2652 | xlcd_init(rb); |
2653 | 2653 | ||
2654 | /* load files */ | 2654 | /* load files */ |
2655 | rb->splash(0, true, "Loading..."); | 2655 | rb->splash(0, "Loading..."); |
2656 | bubbles_loadscores(&bb); | 2656 | bubbles_loadscores(&bb); |
2657 | rb->lcd_clear_display(); | 2657 | rb->lcd_clear_display(); |
2658 | 2658 | ||
@@ -2666,7 +2666,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
2666 | switch(bubbles(&bb)){ | 2666 | switch(bubbles(&bb)){ |
2667 | char str[19]; | 2667 | char str[19]; |
2668 | case BB_WIN: | 2668 | case BB_WIN: |
2669 | rb->splash(HZ*2, true, "You Win!"); | 2669 | rb->splash(HZ*2, "You Win!"); |
2670 | /* record high level */ | 2670 | /* record high level */ |
2671 | if( NUM_LEVELS-1 > bb.highlevel) { | 2671 | if( NUM_LEVELS-1 > bb.highlevel) { |
2672 | bb.highlevel = NUM_LEVELS-1; | 2672 | bb.highlevel = NUM_LEVELS-1; |
@@ -2676,12 +2676,12 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
2676 | /* record high score */ | 2676 | /* record high score */ |
2677 | if((position = bubbles_recordscore(&bb))) { | 2677 | if((position = bubbles_recordscore(&bb))) { |
2678 | rb->snprintf(str, 19, "New high score #%d!", position); | 2678 | rb->snprintf(str, 19, "New high score #%d!", position); |
2679 | rb->splash(HZ*2, true, str); | 2679 | rb->splash(HZ*2, str); |
2680 | } | 2680 | } |
2681 | break; | 2681 | break; |
2682 | 2682 | ||
2683 | case BB_LOSE: | 2683 | case BB_LOSE: |
2684 | rb->splash(HZ*2, true, "Game Over"); | 2684 | rb->splash(HZ*2, "Game Over"); |
2685 | /* fall through to BB_END */ | 2685 | /* fall through to BB_END */ |
2686 | 2686 | ||
2687 | case BB_END: | 2687 | case BB_END: |
@@ -2695,7 +2695,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
2695 | /* record high score */ | 2695 | /* record high score */ |
2696 | if((position = bubbles_recordscore(&bb))) { | 2696 | if((position = bubbles_recordscore(&bb))) { |
2697 | rb->snprintf(str, 19, "New high score #%d!", position); | 2697 | rb->snprintf(str, 19, "New high score #%d!", position); |
2698 | rb->splash(HZ*2, true, str); | 2698 | rb->splash(HZ*2, str); |
2699 | } | 2699 | } |
2700 | } | 2700 | } |
2701 | break; | 2701 | break; |
@@ -2706,7 +2706,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
2706 | 2706 | ||
2707 | case BB_QUIT: | 2707 | case BB_QUIT: |
2708 | if(bb.dirty) { | 2708 | if(bb.dirty) { |
2709 | rb->splash(HZ/2, true, "Saving high scores..."); | 2709 | rb->splash(HZ/2, "Saving high scores..."); |
2710 | bubbles_savescores(&bb); | 2710 | bubbles_savescores(&bb); |
2711 | } | 2711 | } |
2712 | exit = true; | 2712 | exit = true; |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 108b17c9e8..2a8f8ffe45 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -1017,7 +1017,7 @@ void printResult(void) | |||
1017 | switch(calStatus){ | 1017 | switch(calStatus){ |
1018 | case cal_exit: | 1018 | case cal_exit: |
1019 | rb->lcd_clear_display(); | 1019 | rb->lcd_clear_display(); |
1020 | rb->splash(HZ/3, true, "Bye now!"); | 1020 | rb->splash(HZ/3, "Bye now!"); |
1021 | break; | 1021 | break; |
1022 | case cal_error: | 1022 | case cal_error: |
1023 | clearbuf(); | 1023 | clearbuf(); |
@@ -1447,7 +1447,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1447 | lastbtn = btn; | 1447 | lastbtn = btn; |
1448 | } /* while (calStatus != cal_exit ) */ | 1448 | } /* while (calStatus != cal_exit ) */ |
1449 | 1449 | ||
1450 | /* rb->splash(HZ*2, true, "Hello world!"); */ | 1450 | /* rb->splash(HZ*2, "Hello world!"); */ |
1451 | rb->button_clear_queue(); | 1451 | rb->button_clear_queue(); |
1452 | return PLUGIN_OK; | 1452 | return PLUGIN_OK; |
1453 | } | 1453 | } |
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index c6a79e4ec7..da26d0f6db 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c | |||
@@ -384,7 +384,7 @@ void cb_levelup ( void ) { | |||
384 | cb_setlevel ( 1 ); | 384 | cb_setlevel ( 1 ); |
385 | else | 385 | else |
386 | cb_setlevel ( Level+1 ); | 386 | cb_setlevel ( Level+1 ); |
387 | rb->splash ( 50 , true , level_string[Level-1] ); | 387 | rb->splash ( 50 , level_string[Level-1] ); |
388 | }; | 388 | }; |
389 | 389 | ||
390 | /* ---- Save current position ---- */ | 390 | /* ---- Save current position ---- */ |
@@ -393,7 +393,7 @@ void cb_saveposition ( void ) { | |||
393 | short sq,i,c; | 393 | short sq,i,c; |
394 | unsigned short temp; | 394 | unsigned short temp; |
395 | 395 | ||
396 | rb->splash ( 0 , true , "Saving position" ); | 396 | rb->splash ( 0 , "Saving position" ); |
397 | 397 | ||
398 | fd = rb->open(SAVE_FILE, O_WRONLY|O_CREAT); | 398 | fd = rb->open(SAVE_FILE, O_WRONLY|O_CREAT); |
399 | 399 | ||
@@ -448,7 +448,7 @@ void cb_restoreposition ( void ) { | |||
448 | unsigned short m; | 448 | unsigned short m; |
449 | 449 | ||
450 | if ( (fd = rb->open(SAVE_FILE, O_RDONLY)) >= 0 ) { | 450 | if ( (fd = rb->open(SAVE_FILE, O_RDONLY)) >= 0 ) { |
451 | rb->splash ( 0 , true , "Loading position" ); | 451 | rb->splash ( 0 , "Loading position" ); |
452 | rb->read(fd, &(computer), sizeof(computer)); | 452 | rb->read(fd, &(computer), sizeof(computer)); |
453 | rb->read(fd, &(opponent), sizeof(opponent)); | 453 | rb->read(fd, &(opponent), sizeof(opponent)); |
454 | rb->read(fd, &(Game50), sizeof(Game50)); | 454 | rb->read(fd, &(Game50), sizeof(Game50)); |
@@ -673,7 +673,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
673 | 673 | ||
674 | while (!exit) { | 674 | while (!exit) { |
675 | if ( mate ) { | 675 | if ( mate ) { |
676 | rb->splash ( 500 , true , "Checkmate!" ); | 676 | rb->splash ( 500 , "Checkmate!" ); |
677 | rb->button_get(true); | 677 | rb->button_get(true); |
678 | GNUChess_Initialize(); | 678 | GNUChess_Initialize(); |
679 | cb_drawboard(); | 679 | cb_drawboard(); |
@@ -682,11 +682,11 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
682 | switch (command.type) { | 682 | switch (command.type) { |
683 | case COMMAND_MOVE: | 683 | case COMMAND_MOVE: |
684 | if ( ! VerifyMove ( command.mv_s , 0 , &command.mv ) ) { | 684 | if ( ! VerifyMove ( command.mv_s , 0 , &command.mv ) ) { |
685 | rb->splash ( 50 , true , "Illegal move!" ); | 685 | rb->splash ( 50 , "Illegal move!" ); |
686 | cb_drawboard(); | 686 | cb_drawboard(); |
687 | } else { | 687 | } else { |
688 | cb_drawboard(); | 688 | cb_drawboard(); |
689 | rb->splash ( 0 , true , "Thinking..." ); | 689 | rb->splash ( 0 , "Thinking..." ); |
690 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | 690 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ |
691 | rb->cpu_boost ( true ); | 691 | rb->cpu_boost ( true ); |
692 | #endif | 692 | #endif |
@@ -709,7 +709,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
709 | #endif | 709 | #endif |
710 | case COMMAND_PLAY: | 710 | case COMMAND_PLAY: |
711 | opponent = !opponent; computer = !computer; | 711 | opponent = !opponent; computer = !computer; |
712 | rb->splash ( 0 , true , "Thinking..." ); | 712 | rb->splash ( 0 , "Thinking..." ); |
713 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | 713 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ |
714 | rb->cpu_boost ( true ); | 714 | rb->cpu_boost ( true ); |
715 | #endif | 715 | #endif |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 5269e454f1..bb4045249a 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -196,7 +196,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
196 | rb->memset(&settings, 0, sizeof(settings)); | 196 | rb->memset(&settings, 0, sizeof(settings)); |
197 | 197 | ||
198 | /* now go ahead and have fun! */ | 198 | /* now go ahead and have fun! */ |
199 | rb->splash(HZ, true, "Chess Clock"); | 199 | rb->splash(HZ, "Chess Clock"); |
200 | 200 | ||
201 | rb->lcd_clear_display(); | 201 | rb->lcd_clear_display(); |
202 | i=0; | 202 | i=0; |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 44cc58c9d5..6e54669ef0 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1295,7 +1295,7 @@ bool chip8_run(char* file) | |||
1295 | chip8(); | 1295 | chip8(); |
1296 | 1296 | ||
1297 | if (!ok) { | 1297 | if (!ok) { |
1298 | rb->splash(HZ, true, "Error"); | 1298 | rb->splash(HZ, "Error"); |
1299 | return false; | 1299 | return false; |
1300 | } | 1300 | } |
1301 | 1301 | ||
@@ -1308,7 +1308,7 @@ bool chip8_run(char* file) | |||
1308 | 1308 | ||
1309 | if (chip8_running == 3) { | 1309 | if (chip8_running == 3) { |
1310 | /* unsupported instruction */ | 1310 | /* unsupported instruction */ |
1311 | rb->splash(HZ, true, "Error: Unsupported" | 1311 | rb->splash(HZ, "Error: Unsupported" |
1312 | #ifndef CHIP8_SUPER | 1312 | #ifndef CHIP8_SUPER |
1313 | " CHIP-8 instruction. (maybe S-CHIP)" | 1313 | " CHIP-8 instruction. (maybe S-CHIP)" |
1314 | #else | 1314 | #else |
@@ -1332,7 +1332,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1332 | 1332 | ||
1333 | if (parameter == NULL) | 1333 | if (parameter == NULL) |
1334 | { | 1334 | { |
1335 | rb->splash(HZ, true, "Play a .ch8 file!"); | 1335 | rb->splash(HZ, "Play a .ch8 file!"); |
1336 | return PLUGIN_ERROR; | 1336 | return PLUGIN_ERROR; |
1337 | } | 1337 | } |
1338 | else | 1338 | else |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 941f139414..1efe202946 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -484,17 +484,17 @@ static void chopKillPlayer(void) | |||
484 | #if LCD_DEPTH >= 2 | 484 | #if LCD_DEPTH >= 2 |
485 | rb->lcd_set_foreground(LCD_LIGHTGRAY); | 485 | rb->lcd_set_foreground(LCD_LIGHTGRAY); |
486 | #endif | 486 | #endif |
487 | rb->splash(HZ, true, "Game Over"); | 487 | rb->splash(HZ, "Game Over"); |
488 | 488 | ||
489 | if (score > highscore) { | 489 | if (score > highscore) { |
490 | char scoretext[30]; | 490 | char scoretext[30]; |
491 | highscore = score; | 491 | highscore = score; |
492 | rb->snprintf(scoretext, sizeof(scoretext), "New High Score: %d", | 492 | rb->snprintf(scoretext, sizeof(scoretext), "New High Score: %d", |
493 | highscore); | 493 | highscore); |
494 | rb->splash(HZ*2, true, scoretext); | 494 | rb->splash(HZ*2, scoretext); |
495 | } | 495 | } |
496 | 496 | ||
497 | rb->splash(HZ/4, true, "Press " ACTIONTEXT " to continue"); | 497 | rb->splash(HZ/4, "Press " ACTIONTEXT " to continue"); |
498 | rb->lcd_update(); | 498 | rb->lcd_update(); |
499 | 499 | ||
500 | rb->lcd_set_drawmode(DRMODE_SOLID); | 500 | rb->lcd_set_drawmode(DRMODE_SOLID); |
@@ -668,7 +668,7 @@ static int chopMenu(int menunum) | |||
668 | menu_quit=true; | 668 | menu_quit=true; |
669 | res = -1; | 669 | res = -1; |
670 | } else if(menunum==0){ | 670 | } else if(menunum==0){ |
671 | rb->splash(HZ, true, "No game to resume"); | 671 | rb->splash(HZ, "No game to resume"); |
672 | } | 672 | } |
673 | break; | 673 | break; |
674 | case 2: | 674 | case 2: |
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c index 010e293bac..dfc5fd7163 100644 --- a/apps/plugins/clock.c +++ b/apps/plugins/clock.c | |||
@@ -1418,10 +1418,10 @@ void confirm_reset(void) | |||
1418 | if(result == 1) /* reset! */ | 1418 | if(result == 1) /* reset! */ |
1419 | { | 1419 | { |
1420 | reset_settings(); | 1420 | reset_settings(); |
1421 | rb->splash(HZ, true, "Settings reset!"); | 1421 | rb->splash(HZ, "Settings reset!"); |
1422 | } | 1422 | } |
1423 | else | 1423 | else |
1424 | rb->splash(HZ, true, "Settings NOT reset."); | 1424 | rb->splash(HZ, "Settings NOT reset."); |
1425 | } | 1425 | } |
1426 | 1426 | ||
1427 | /************************************ | 1427 | /************************************ |
@@ -1449,7 +1449,7 @@ void general_settings(void) | |||
1449 | 1449 | ||
1450 | case 1: | 1450 | case 1: |
1451 | save_settings(false); | 1451 | save_settings(false); |
1452 | rb->splash(HZ, true, "Settings saved"); | 1452 | rb->splash(HZ, "Settings saved"); |
1453 | break; | 1453 | break; |
1454 | 1454 | ||
1455 | case 2: | 1455 | case 2: |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 57f1015368..526400db61 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -580,7 +580,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
580 | if (gray_init(rb, gbuf, gbuf_size, true, LCD_WIDTH, LCD_HEIGHT, 3, 0, NULL) | 580 | if (gray_init(rb, gbuf, gbuf_size, true, LCD_WIDTH, LCD_HEIGHT, 3, 0, NULL) |
581 | != 3) | 581 | != 3) |
582 | { | 582 | { |
583 | rb->splash(HZ, true, "Couldn't get grayscale buffer"); | 583 | rb->splash(HZ, "Couldn't get grayscale buffer"); |
584 | return PLUGIN_ERROR; | 584 | return PLUGIN_ERROR; |
585 | } | 585 | } |
586 | /* init lcd_ function pointers */ | 586 | /* init lcd_ function pointers */ |
@@ -595,7 +595,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
595 | #else /* LCD_CHARCELLS */ | 595 | #else /* LCD_CHARCELLS */ |
596 | if (!pgfx_init(rb, 4, 2)) | 596 | if (!pgfx_init(rb, 4, 2)) |
597 | { | 597 | { |
598 | rb->splash(HZ*2, true, "Old LCD :("); | 598 | rb->splash(HZ*2, "Old LCD :("); |
599 | return PLUGIN_OK; | 599 | return PLUGIN_OK; |
600 | } | 600 | } |
601 | pgfx_display(3, 0); | 601 | pgfx_display(3, 0); |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 1a0cbaab5b..4e5066af79 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -172,7 +172,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
172 | if (fIndex < 0) | 172 | if (fIndex < 0) |
173 | { | 173 | { |
174 | DEBUGF("Err: Failed to open index file.\n"); | 174 | DEBUGF("Err: Failed to open index file.\n"); |
175 | rb->splash(HZ*2, true, "Failed to open index."); | 175 | rb->splash(HZ*2, "Failed to open index."); |
176 | return PLUGIN_ERROR; | 176 | return PLUGIN_ERROR; |
177 | } | 177 | } |
178 | 178 | ||
@@ -212,7 +212,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
212 | if (low == -1 || rb->strcasecmp(searchword, word.word) != 0) | 212 | if (low == -1 || rb->strcasecmp(searchword, word.word) != 0) |
213 | { | 213 | { |
214 | DEBUGF("Not found.\n"); | 214 | DEBUGF("Not found.\n"); |
215 | rb->splash(HZ*2, true, "Not found."); | 215 | rb->splash(HZ*2, "Not found."); |
216 | rb->close(fIndex); | 216 | rb->close(fIndex); |
217 | return PLUGIN_OK; | 217 | return PLUGIN_OK; |
218 | } | 218 | } |
@@ -224,7 +224,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
224 | if (fData < 0) | 224 | if (fData < 0) |
225 | { | 225 | { |
226 | DEBUGF("Err: Failed to open description file.\n"); | 226 | DEBUGF("Err: Failed to open description file.\n"); |
227 | rb->splash(HZ*2, true, "Failed to open descriptions."); | 227 | rb->splash(HZ*2, "Failed to open descriptions."); |
228 | rb->close(fIndex); | 228 | rb->close(fIndex); |
229 | return PLUGIN_ERROR; | 229 | return PLUGIN_ERROR; |
230 | } | 230 | } |
diff --git a/apps/plugins/disktidy.c b/apps/plugins/disktidy.c index d9df6ffd5f..651ed5f3ba 100644 --- a/apps/plugins/disktidy.c +++ b/apps/plugins/disktidy.c | |||
@@ -330,10 +330,10 @@ enum plugin_status tidy_do(enum tidy_system system) | |||
330 | rb->snprintf(text, 24, "Cleaned up %d items", removed); | 330 | rb->snprintf(text, 24, "Cleaned up %d items", removed); |
331 | if (status == TIDY_RETURN_ABORT) | 331 | if (status == TIDY_RETURN_ABORT) |
332 | { | 332 | { |
333 | rb->splash(HZ, true, "User aborted"); | 333 | rb->splash(HZ, "User aborted"); |
334 | rb->lcd_clear_display(); | 334 | rb->lcd_clear_display(); |
335 | } | 335 | } |
336 | rb->splash(HZ*2, true, text); | 336 | rb->splash(HZ*2, text); |
337 | } | 337 | } |
338 | return status; | 338 | return status; |
339 | } | 339 | } |
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index 305eeafd03..1081324974 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c | |||
@@ -610,7 +610,7 @@ int doom_menu() | |||
610 | 610 | ||
611 | if( (status=Dbuild_base(names)) == 0 ) // Build up the base wad files (select last added file) | 611 | if( (status=Dbuild_base(names)) == 0 ) // Build up the base wad files (select last added file) |
612 | { | 612 | { |
613 | rb->splash(HZ*2, true, "Missing Base WAD!"); | 613 | rb->splash(HZ*2, "Missing Base WAD!"); |
614 | return -2; | 614 | return -2; |
615 | } | 615 | } |
616 | 616 | ||
@@ -694,7 +694,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
694 | printf ("M_LoadDefaults: Load system defaults.\n"); | 694 | printf ("M_LoadDefaults: Load system defaults.\n"); |
695 | M_LoadDefaults (); // load before initing other systems | 695 | M_LoadDefaults (); // load before initing other systems |
696 | 696 | ||
697 | rb->splash(HZ*2, true, "Welcome to RockDoom"); | 697 | rb->splash(HZ*2, "Welcome to RockDoom"); |
698 | 698 | ||
699 | myargv =0; | 699 | myargv =0; |
700 | myargc=0; | 700 | myargc=0; |
diff --git a/apps/plugins/doom/v_video.c b/apps/plugins/doom/v_video.c index 167316beae..a7e2baea16 100644 --- a/apps/plugins/doom/v_video.c +++ b/apps/plugins/doom/v_video.c | |||
@@ -431,7 +431,7 @@ void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch, | |||
431 | || y<0 | 431 | || y<0 |
432 | || y+SHORT(patch->height) > ((flags & VPT_STRETCH) ? 200 : SCREENHEIGHT)) | 432 | || y+SHORT(patch->height) > ((flags & VPT_STRETCH) ? 200 : SCREENHEIGHT)) |
433 | { | 433 | { |
434 | rb->splash(HZ*2, true, "This wad does not follow standard doom graphics!"); | 434 | rb->splash(HZ*2, "This wad does not follow standard doom graphics!"); |
435 | // killough 1/19/98: improved error message: | 435 | // killough 1/19/98: improved error message: |
436 | I_Error("V_DrawMemPatch: Patch (%d,%d)-(%d,%d) exceeds LFB Bad V_DrawMemPatch (flags=%u)", | 436 | I_Error("V_DrawMemPatch: Patch (%d,%d)-(%d,%d) exceeds LFB Bad V_DrawMemPatch (flags=%u)", |
437 | x, y, x+SHORT(patch->width), y+SHORT(patch->height), flags); | 437 | x, y, x+SHORT(patch->width), y+SHORT(patch->height), flags); |
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index 2e762cb9e9..c293bf7af6 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c | |||
@@ -352,7 +352,7 @@ int main(void) | |||
352 | 32, 1<<8, NULL) + 1; | 352 | 32, 1<<8, NULL) + 1; |
353 | if(shades <= 1) | 353 | if(shades <= 1) |
354 | { | 354 | { |
355 | rb->splash(HZ, true, "not enough memory"); | 355 | rb->splash(HZ, "not enough memory"); |
356 | return PLUGIN_ERROR; | 356 | return PLUGIN_ERROR; |
357 | } | 357 | } |
358 | /* switch on grayscale overlay */ | 358 | /* switch on grayscale overlay */ |
diff --git a/apps/plugins/firmware_flash.c b/apps/plugins/firmware_flash.c index 1fc6b07a89..073667e73f 100644 --- a/apps/plugins/firmware_flash.c +++ b/apps/plugins/firmware_flash.c | |||
@@ -647,21 +647,21 @@ void DoUserDialog(char* filename) | |||
647 | /* this can only work if Rockbox runs in DRAM, not flash ROM */ | 647 | /* this can only work if Rockbox runs in DRAM, not flash ROM */ |
648 | if ((UINT8*)rb >= FB && (UINT8*)rb < FB + 4096*1024) /* 4 MB max */ | 648 | if ((UINT8*)rb >= FB && (UINT8*)rb < FB + 4096*1024) /* 4 MB max */ |
649 | { /* we're running from flash */ | 649 | { /* we're running from flash */ |
650 | rb->splash(HZ*3, true, "Not from ROM"); | 650 | rb->splash(HZ*3, "Not from ROM"); |
651 | return; /* exit */ | 651 | return; /* exit */ |
652 | } | 652 | } |
653 | 653 | ||
654 | /* test if the user is running the correct plugin for this box */ | 654 | /* test if the user is running the correct plugin for this box */ |
655 | if (!CheckPlatform(PLATFORM_ID, *(UINT16*)(FB + VERSION_ADR))) | 655 | if (!CheckPlatform(PLATFORM_ID, *(UINT16*)(FB + VERSION_ADR))) |
656 | { | 656 | { |
657 | rb->splash(HZ*3, true, "Wrong plugin"); | 657 | rb->splash(HZ*3, "Wrong plugin"); |
658 | return; /* exit */ | 658 | return; /* exit */ |
659 | } | 659 | } |
660 | 660 | ||
661 | /* refuse to work if the power may fail meanwhile */ | 661 | /* refuse to work if the power may fail meanwhile */ |
662 | if (!rb->battery_level_safe()) | 662 | if (!rb->battery_level_safe()) |
663 | { | 663 | { |
664 | rb->splash(HZ*3, true, "Battery too low!"); | 664 | rb->splash(HZ*3, "Battery too low!"); |
665 | return; /* exit */ | 665 | return; /* exit */ |
666 | } | 666 | } |
667 | 667 | ||
@@ -669,7 +669,7 @@ void DoUserDialog(char* filename) | |||
669 | result = CheckBootROM(); | 669 | result = CheckBootROM(); |
670 | if (result == eUnknown) | 670 | if (result == eUnknown) |
671 | { /* no support for any other yet */ | 671 | { /* no support for any other yet */ |
672 | rb->splash(HZ*3, true, "Wrong boot ROM"); | 672 | rb->splash(HZ*3, "Wrong boot ROM"); |
673 | return; /* exit */ | 673 | return; /* exit */ |
674 | } | 674 | } |
675 | is_romless = (result == eROMless); | 675 | is_romless = (result == eROMless); |
@@ -690,7 +690,7 @@ void DoUserDialog(char* filename) | |||
690 | sector = rb->plugin_get_buffer(&memleft); | 690 | sector = rb->plugin_get_buffer(&memleft); |
691 | if (memleft < SEC_SIZE) /* need buffer for a flash sector */ | 691 | if (memleft < SEC_SIZE) /* need buffer for a flash sector */ |
692 | { | 692 | { |
693 | rb->splash(HZ*3, true, "Out of memory"); | 693 | rb->splash(HZ*3, "Out of memory"); |
694 | return; /* exit */ | 694 | return; /* exit */ |
695 | } | 695 | } |
696 | 696 | ||
@@ -700,7 +700,7 @@ void DoUserDialog(char* filename) | |||
700 | ShowFlashInfo(&FlashInfo); | 700 | ShowFlashInfo(&FlashInfo); |
701 | if (FlashInfo.size == 0) /* no valid chip */ | 701 | if (FlashInfo.size == 0) /* no valid chip */ |
702 | { | 702 | { |
703 | rb->splash(HZ*3, true, "Sorry!"); | 703 | rb->splash(HZ*3, "Sorry!"); |
704 | return; /* exit */ | 704 | return; /* exit */ |
705 | } | 705 | } |
706 | 706 | ||
@@ -884,21 +884,21 @@ void DoUserDialog(char* filename) | |||
884 | /* this can only work if Rockbox runs in DRAM, not flash ROM */ | 884 | /* this can only work if Rockbox runs in DRAM, not flash ROM */ |
885 | if ((UINT8*)rb >= FB && (UINT8*)rb < FB + 4096*1024) /* 4 MB max */ | 885 | if ((UINT8*)rb >= FB && (UINT8*)rb < FB + 4096*1024) /* 4 MB max */ |
886 | { /* we're running from flash */ | 886 | { /* we're running from flash */ |
887 | rb->splash(HZ*3, true, "Not from ROM"); | 887 | rb->splash(HZ*3, "Not from ROM"); |
888 | return; /* exit */ | 888 | return; /* exit */ |
889 | } | 889 | } |
890 | 890 | ||
891 | /* test if the user is running the correct plugin for this box */ | 891 | /* test if the user is running the correct plugin for this box */ |
892 | if (!CheckPlatform(PLATFORM_ID, *(UINT16*)(FB + VERSION_ADR))) | 892 | if (!CheckPlatform(PLATFORM_ID, *(UINT16*)(FB + VERSION_ADR))) |
893 | { | 893 | { |
894 | rb->splash(HZ*3, true, "Wrong version"); | 894 | rb->splash(HZ*3, "Wrong version"); |
895 | return; /* exit */ | 895 | return; /* exit */ |
896 | } | 896 | } |
897 | 897 | ||
898 | /* refuse to work if the power may fail meanwhile */ | 898 | /* refuse to work if the power may fail meanwhile */ |
899 | if (!rb->battery_level_safe()) | 899 | if (!rb->battery_level_safe()) |
900 | { | 900 | { |
901 | rb->splash(HZ*3, true, "Batt. too low!"); | 901 | rb->splash(HZ*3, "Batt. too low!"); |
902 | return; /* exit */ | 902 | return; /* exit */ |
903 | } | 903 | } |
904 | 904 | ||
@@ -906,7 +906,7 @@ void DoUserDialog(char* filename) | |||
906 | result = CheckBootROM(); | 906 | result = CheckBootROM(); |
907 | if (result == eUnknown) | 907 | if (result == eUnknown) |
908 | { /* no support for any other yet */ | 908 | { /* no support for any other yet */ |
909 | rb->splash(HZ*3, true, "Wrong boot ROM"); | 909 | rb->splash(HZ*3, "Wrong boot ROM"); |
910 | return; /* exit */ | 910 | return; /* exit */ |
911 | } | 911 | } |
912 | is_romless = (result == eROMless); | 912 | is_romless = (result == eROMless); |
@@ -927,7 +927,7 @@ void DoUserDialog(char* filename) | |||
927 | sector = rb->plugin_get_buffer(&memleft); | 927 | sector = rb->plugin_get_buffer(&memleft); |
928 | if (memleft < SEC_SIZE) /* need buffer for a flash sector */ | 928 | if (memleft < SEC_SIZE) /* need buffer for a flash sector */ |
929 | { | 929 | { |
930 | rb->splash(HZ*3, true, "Out of memory"); | 930 | rb->splash(HZ*3, "Out of memory"); |
931 | return; /* exit */ | 931 | return; /* exit */ |
932 | } | 932 | } |
933 | 933 | ||
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index bdf15b7bff..d6083ee7e7 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -482,7 +482,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
482 | rb->lcd_set_backdrop(NULL); | 482 | rb->lcd_set_backdrop(NULL); |
483 | #endif | 483 | #endif |
484 | 484 | ||
485 | rb->splash(HZ, true, "FlipIt!"); | 485 | rb->splash(HZ, "FlipIt!"); |
486 | 486 | ||
487 | #ifdef HAVE_LCD_BITMAP | 487 | #ifdef HAVE_LCD_BITMAP |
488 | /* print instructions */ | 488 | /* print instructions */ |
diff --git a/apps/plugins/helloworld.c b/apps/plugins/helloworld.c index e4220e4af3..6ef5b584ce 100644 --- a/apps/plugins/helloworld.c +++ b/apps/plugins/helloworld.c | |||
@@ -41,7 +41,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
41 | rb = api; | 41 | rb = api; |
42 | 42 | ||
43 | /* now go ahead and have fun! */ | 43 | /* now go ahead and have fun! */ |
44 | rb->splash(HZ*2, true, "Hello world!"); | 44 | rb->splash(HZ*2, "Hello world!"); |
45 | 45 | ||
46 | return PLUGIN_OK; | 46 | return PLUGIN_OK; |
47 | } | 47 | } |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 5e537b4bbc..270f08dd1b 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -1660,12 +1660,12 @@ inline bool handle_buttons(void) | |||
1660 | } | 1660 | } |
1661 | #ifdef RC_QUIT | 1661 | #ifdef RC_QUIT |
1662 | if (pressed & RC_QUIT) { | 1662 | if (pressed & RC_QUIT) { |
1663 | rb->splash(HZ * 1, true, "Quit"); | 1663 | rb->splash(HZ * 1, "Quit"); |
1664 | return true; | 1664 | return true; |
1665 | } | 1665 | } |
1666 | #endif | 1666 | #endif |
1667 | if (pressed & QUIT) { | 1667 | if (pressed & QUIT) { |
1668 | rb->splash(HZ * 1, true, "Quit"); | 1668 | rb->splash(HZ * 1, "Quit"); |
1669 | return true; | 1669 | return true; |
1670 | } | 1670 | } |
1671 | } | 1671 | } |
@@ -1772,7 +1772,7 @@ enum plugin_status plugin_start(struct plugin_api* api, UNUSED void* parameter) | |||
1772 | 1772 | ||
1773 | /* Game Over. */ | 1773 | /* Game Over. */ |
1774 | /* TODO: Play game over sound */ | 1774 | /* TODO: Play game over sound */ |
1775 | rb->splash(HZ * 2, true, "Game Over"); | 1775 | rb->splash(HZ * 2, "Game Over"); |
1776 | if (score > hiscore.score) { | 1776 | if (score > hiscore.score) { |
1777 | /* Save new hiscore */ | 1777 | /* Save new hiscore */ |
1778 | hiscore.score = score; | 1778 | hiscore.score = score; |
diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c index 29fa440cbb..3d2ae7dcd5 100644 --- a/apps/plugins/iriver_flash.c +++ b/apps/plugins/iriver_flash.c | |||
@@ -275,7 +275,7 @@ bool show_info(void) | |||
275 | ShowFlashInfo(&fi); | 275 | ShowFlashInfo(&fi); |
276 | if (fi.size == 0) /* no valid chip */ | 276 | if (fi.size == 0) /* no valid chip */ |
277 | { | 277 | { |
278 | rb->splash(HZ*3, true, "Sorry!"); | 278 | rb->splash(HZ*3, "Sorry!"); |
279 | return false; /* exit */ | 279 | return false; /* exit */ |
280 | } | 280 | } |
281 | 281 | ||
@@ -288,7 +288,7 @@ bool confirm(const char *msg) | |||
288 | bool ret; | 288 | bool ret; |
289 | 289 | ||
290 | rb->snprintf(buf, sizeof buf, "%s ([PLAY] to CONFIRM)", msg); | 290 | rb->snprintf(buf, sizeof buf, "%s ([PLAY] to CONFIRM)", msg); |
291 | rb->splash(0, true, buf); | 291 | rb->splash(0, buf); |
292 | 292 | ||
293 | ret = (wait_for_button() == BUTTON_ON); | 293 | ret = (wait_for_button() == BUTTON_ON); |
294 | show_info(); | 294 | show_info(); |
@@ -311,7 +311,7 @@ int load_firmware_file(const char *filename, uint32_t *checksum) | |||
311 | 311 | ||
312 | if (audiobuf_size < len) | 312 | if (audiobuf_size < len) |
313 | { | 313 | { |
314 | rb->splash(HZ*3, true, "Aborting: Out of memory!"); | 314 | rb->splash(HZ*3, "Aborting: Out of memory!"); |
315 | rb->close(fd); | 315 | rb->close(fd); |
316 | return -2; | 316 | return -2; |
317 | } | 317 | } |
@@ -324,7 +324,7 @@ int load_firmware_file(const char *filename, uint32_t *checksum) | |||
324 | rb->close(fd); | 324 | rb->close(fd); |
325 | if (rc != len) | 325 | if (rc != len) |
326 | { | 326 | { |
327 | rb->splash(HZ*3, true, "Aborting: Read failure"); | 327 | rb->splash(HZ*3, "Aborting: Read failure"); |
328 | return -3; | 328 | return -3; |
329 | } | 329 | } |
330 | 330 | ||
@@ -335,7 +335,7 @@ int load_firmware_file(const char *filename, uint32_t *checksum) | |||
335 | 335 | ||
336 | if (sum != *checksum) | 336 | if (sum != *checksum) |
337 | { | 337 | { |
338 | rb->splash(HZ*3, true, "Aborting: Checksums mismatch!"); | 338 | rb->splash(HZ*3, "Aborting: Checksums mismatch!"); |
339 | return -4; | 339 | return -4; |
340 | } | 340 | } |
341 | 341 | ||
@@ -393,7 +393,7 @@ int flash_rockbox(const char *filename, int section) | |||
393 | p8 = (char *)BOOTLOADER_ENTRYPOINT; | 393 | p8 = (char *)BOOTLOADER_ENTRYPOINT; |
394 | if (!detect_valid_bootloader(p8, 0)) | 394 | if (!detect_valid_bootloader(p8, 0)) |
395 | { | 395 | { |
396 | rb->splash(HZ*3, true, "Incompatible bootloader"); | 396 | rb->splash(HZ*3, "Incompatible bootloader"); |
397 | return -1; | 397 | return -1; |
398 | } | 398 | } |
399 | 399 | ||
@@ -423,7 +423,7 @@ int flash_rockbox(const char *filename, int section) | |||
423 | { | 423 | { |
424 | rb->snprintf(buf, sizeof(buf), "Incorrect relocation: 0x%08x/0x%08x", | 424 | rb->snprintf(buf, sizeof(buf), "Incorrect relocation: 0x%08x/0x%08x", |
425 | *p32, pos+sizeof(struct flash_header)); | 425 | *p32, pos+sizeof(struct flash_header)); |
426 | rb->splash(HZ*10, true, buf); | 426 | rb->splash(HZ*10, buf); |
427 | return -1; | 427 | return -1; |
428 | } | 428 | } |
429 | 429 | ||
@@ -489,7 +489,7 @@ int flash_rockbox(const char *filename, int section) | |||
489 | 489 | ||
490 | if (sum != checksum) | 490 | if (sum != checksum) |
491 | { | 491 | { |
492 | rb->splash(HZ*3, true, "Verify failed!"); | 492 | rb->splash(HZ*3, "Verify failed!"); |
493 | /* Erase the magic sector so bootloader does not try to load | 493 | /* Erase the magic sector so bootloader does not try to load |
494 | * rockbox from flash and crash. */ | 494 | * rockbox from flash and crash. */ |
495 | if (section == SECT_RAMIMAGE) | 495 | if (section == SECT_RAMIMAGE) |
@@ -499,17 +499,17 @@ int flash_rockbox(const char *filename, int section) | |||
499 | return -5; | 499 | return -5; |
500 | } | 500 | } |
501 | 501 | ||
502 | rb->splash(HZ*2, true, "Success"); | 502 | rb->splash(HZ*2, "Success"); |
503 | 503 | ||
504 | return 0; | 504 | return 0; |
505 | } | 505 | } |
506 | 506 | ||
507 | void show_fatal_error(void) | 507 | void show_fatal_error(void) |
508 | { | 508 | { |
509 | rb->splash(HZ*30, true, "Disable idle poweroff, connect AC power and DON'T TURN PLAYER OFF!!"); | 509 | rb->splash(HZ*30, "Disable idle poweroff, connect AC power and DON'T TURN PLAYER OFF!!"); |
510 | rb->splash(HZ*30, true, "Contact Rockbox developers as soon as possible!"); | 510 | rb->splash(HZ*30, "Contact Rockbox developers as soon as possible!"); |
511 | rb->splash(HZ*30, true, "Your device won't be bricked unless you turn off the power"); | 511 | rb->splash(HZ*30, "Your device won't be bricked unless you turn off the power"); |
512 | rb->splash(HZ*30, true, "Don't use the device before further instructions from Rockbox developers"); | 512 | rb->splash(HZ*30, "Don't use the device before further instructions from Rockbox developers"); |
513 | } | 513 | } |
514 | 514 | ||
515 | int flash_bootloader(const char *filename) | 515 | int flash_bootloader(const char *filename) |
@@ -533,14 +533,14 @@ int flash_bootloader(const char *filename) | |||
533 | 533 | ||
534 | if (len > 0xFFFF) | 534 | if (len > 0xFFFF) |
535 | { | 535 | { |
536 | rb->splash(HZ*3, true, "Too big bootloader"); | 536 | rb->splash(HZ*3, "Too big bootloader"); |
537 | return -1; | 537 | return -1; |
538 | } | 538 | } |
539 | 539 | ||
540 | /* Verify the crc32 checksum also. */ | 540 | /* Verify the crc32 checksum also. */ |
541 | if (!detect_valid_bootloader(audiobuf, len)) | 541 | if (!detect_valid_bootloader(audiobuf, len)) |
542 | { | 542 | { |
543 | rb->splash(HZ*3, true, "Incompatible/Untested bootloader"); | 543 | rb->splash(HZ*3, "Incompatible/Untested bootloader"); |
544 | return -1; | 544 | return -1; |
545 | } | 545 | } |
546 | 546 | ||
@@ -579,7 +579,7 @@ int flash_bootloader(const char *filename) | |||
579 | 579 | ||
580 | if (sum != checksum) | 580 | if (sum != checksum) |
581 | { | 581 | { |
582 | rb->splash(HZ*3, true, "Verify failed!"); | 582 | rb->splash(HZ*3, "Verify failed!"); |
583 | show_fatal_error(); | 583 | show_fatal_error(); |
584 | return -5; | 584 | return -5; |
585 | } | 585 | } |
@@ -589,13 +589,13 @@ int flash_bootloader(const char *filename) | |||
589 | { | 589 | { |
590 | if (p8[i] != audiobuf[i]) | 590 | if (p8[i] != audiobuf[i]) |
591 | { | 591 | { |
592 | rb->splash(HZ*3, true, "Bootvector corrupt!"); | 592 | rb->splash(HZ*3, "Bootvector corrupt!"); |
593 | show_fatal_error(); | 593 | show_fatal_error(); |
594 | return -6; | 594 | return -6; |
595 | } | 595 | } |
596 | } | 596 | } |
597 | 597 | ||
598 | rb->splash(HZ*2, true, "Success"); | 598 | rb->splash(HZ*2, "Success"); |
599 | 599 | ||
600 | return 0; | 600 | return 0; |
601 | } | 601 | } |
@@ -653,7 +653,7 @@ int flash_original_fw(int len) | |||
653 | { | 653 | { |
654 | if (p8[i] != reset_vector[i]) | 654 | if (p8[i] != reset_vector[i]) |
655 | { | 655 | { |
656 | rb->splash(HZ*3, true, "Bootvector corrupt!"); | 656 | rb->splash(HZ*3, "Bootvector corrupt!"); |
657 | show_fatal_error(); | 657 | show_fatal_error(); |
658 | break; | 658 | break; |
659 | } | 659 | } |
@@ -665,14 +665,14 @@ int flash_original_fw(int len) | |||
665 | { | 665 | { |
666 | if (p8[i] != audiobuf[i]) | 666 | if (p8[i] != audiobuf[i]) |
667 | { | 667 | { |
668 | rb->splash(HZ*3, true, "Verify failed!"); | 668 | rb->splash(HZ*3, "Verify failed!"); |
669 | rb->snprintf(buf, sizeof buf, "at: 0x%08x", i); | 669 | rb->snprintf(buf, sizeof buf, "at: 0x%08x", i); |
670 | rb->splash(HZ*10, true, buf); | 670 | rb->splash(HZ*10, buf); |
671 | return -5; | 671 | return -5; |
672 | } | 672 | } |
673 | } | 673 | } |
674 | 674 | ||
675 | rb->splash(HZ*2, true, "Success"); | 675 | rb->splash(HZ*2, "Success"); |
676 | 676 | ||
677 | return 0; | 677 | return 0; |
678 | } | 678 | } |
@@ -695,7 +695,7 @@ int load_original_bin(const char *filename) | |||
695 | rb->read(fd, magic, 8); | 695 | rb->read(fd, magic, 8); |
696 | if (magic[1] != 0x00000008 || len <= 0 || len > audiobuf_size) | 696 | if (magic[1] != 0x00000008 || len <= 0 || len > audiobuf_size) |
697 | { | 697 | { |
698 | rb->splash(HZ*2, true, "Not an original firmware file"); | 698 | rb->splash(HZ*2, "Not an original firmware file"); |
699 | rb->close(fd); | 699 | rb->close(fd); |
700 | return -1; | 700 | return -1; |
701 | } | 701 | } |
@@ -705,7 +705,7 @@ int load_original_bin(const char *filename) | |||
705 | 705 | ||
706 | if (rc != len) | 706 | if (rc != len) |
707 | { | 707 | { |
708 | rb->splash(HZ*2, true, "Read error"); | 708 | rb->splash(HZ*2, "Read error"); |
709 | return -2; | 709 | return -2; |
710 | } | 710 | } |
711 | 711 | ||
@@ -737,7 +737,7 @@ int load_romdump(const char *filename) | |||
737 | 737 | ||
738 | if (rc != len) | 738 | if (rc != len) |
739 | { | 739 | { |
740 | rb->splash(HZ*2, true, "Read error"); | 740 | rb->splash(HZ*2, "Read error"); |
741 | return -2; | 741 | return -2; |
742 | } | 742 | } |
743 | 743 | ||
@@ -756,14 +756,14 @@ void DoUserDialog(char* filename) | |||
756 | /* this can only work if Rockbox runs in DRAM, not flash ROM */ | 756 | /* this can only work if Rockbox runs in DRAM, not flash ROM */ |
757 | if ((uint16_t*)rb >= FB && (uint16_t*)rb < FB + 4096*1024) /* 4 MB max */ | 757 | if ((uint16_t*)rb >= FB && (uint16_t*)rb < FB + 4096*1024) /* 4 MB max */ |
758 | { /* we're running from flash */ | 758 | { /* we're running from flash */ |
759 | rb->splash(HZ*3, true, "Not from ROM"); | 759 | rb->splash(HZ*3, "Not from ROM"); |
760 | return; /* exit */ | 760 | return; /* exit */ |
761 | } | 761 | } |
762 | 762 | ||
763 | /* refuse to work if the power may fail meanwhile */ | 763 | /* refuse to work if the power may fail meanwhile */ |
764 | if (!rb->battery_level_safe()) | 764 | if (!rb->battery_level_safe()) |
765 | { | 765 | { |
766 | rb->splash(HZ*3, true, "Battery too low!"); | 766 | rb->splash(HZ*3, "Battery too low!"); |
767 | return; /* exit */ | 767 | return; /* exit */ |
768 | } | 768 | } |
769 | 769 | ||
@@ -773,7 +773,7 @@ void DoUserDialog(char* filename) | |||
773 | 773 | ||
774 | if (filename == NULL) | 774 | if (filename == NULL) |
775 | { | 775 | { |
776 | rb->splash(HZ*3, true, "Please use this plugin with \"Open with...\""); | 776 | rb->splash(HZ*3, "Please use this plugin with \"Open with...\""); |
777 | return ; | 777 | return ; |
778 | } | 778 | } |
779 | 779 | ||
@@ -790,7 +790,7 @@ void DoUserDialog(char* filename) | |||
790 | else if (rb->strcasestr(filename, "/internal_rom_000000-1FFFFF.bin")) | 790 | else if (rb->strcasestr(filename, "/internal_rom_000000-1FFFFF.bin")) |
791 | load_romdump(filename); | 791 | load_romdump(filename); |
792 | else | 792 | else |
793 | rb->splash(HZ*3, true, "Unknown file type"); | 793 | rb->splash(HZ*3, "Unknown file type"); |
794 | } | 794 | } |
795 | 795 | ||
796 | 796 | ||
diff --git a/apps/plugins/iriverify.c b/apps/plugins/iriverify.c index 555c9200e3..91d890e457 100644 --- a/apps/plugins/iriverify.c +++ b/apps/plugins/iriverify.c | |||
@@ -144,28 +144,28 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
144 | stringbuffer = buf; | 144 | stringbuffer = buf; |
145 | 145 | ||
146 | rb->lcd_clear_display(); | 146 | rb->lcd_clear_display(); |
147 | rb->splash(0, true, "Converting..."); | 147 | rb->splash(0, "Converting..."); |
148 | 148 | ||
149 | rc = read_buffer(0); | 149 | rc = read_buffer(0); |
150 | if(rc == 0) { | 150 | if(rc == 0) { |
151 | rb->lcd_clear_display(); | 151 | rb->lcd_clear_display(); |
152 | rb->splash(0, true, "Writing..."); | 152 | rb->splash(0, "Writing..."); |
153 | rc = write_file(); | 153 | rc = write_file(); |
154 | 154 | ||
155 | if(rc < 0) { | 155 | if(rc < 0) { |
156 | rb->lcd_clear_display(); | 156 | rb->lcd_clear_display(); |
157 | rb->splash(HZ, true, "Can't write file: %d", rc); | 157 | rb->splash(HZ, "Can't write file: %d", rc); |
158 | } else { | 158 | } else { |
159 | rb->lcd_clear_display(); | 159 | rb->lcd_clear_display(); |
160 | rb->splash(HZ, true, "Done"); | 160 | rb->splash(HZ, "Done"); |
161 | } | 161 | } |
162 | } else { | 162 | } else { |
163 | if(rc < 0) { | 163 | if(rc < 0) { |
164 | rb->lcd_clear_display(); | 164 | rb->lcd_clear_display(); |
165 | rb->splash(HZ, true, "Can't read file: %d", rc); | 165 | rb->splash(HZ, "Can't read file: %d", rc); |
166 | } else { | 166 | } else { |
167 | rb->lcd_clear_display(); | 167 | rb->lcd_clear_display(); |
168 | rb->splash(HZ, true, "The file is too big"); | 168 | rb->splash(HZ, "The file is too big"); |
169 | } | 169 | } |
170 | } | 170 | } |
171 | 171 | ||
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index d0bf1af5e1..d4bef240e8 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -1026,7 +1026,7 @@ static unsigned int jewels_nextlevel(struct game_context* bj) { | |||
1026 | while(bj->score >= LEVEL_PTS) { | 1026 | while(bj->score >= LEVEL_PTS) { |
1027 | bj->score -= LEVEL_PTS; | 1027 | bj->score -= LEVEL_PTS; |
1028 | bj->level++; | 1028 | bj->level++; |
1029 | rb->splash(HZ*2, true, "Level %d", bj->level); | 1029 | rb->splash(HZ*2, "Level %d", bj->level); |
1030 | jewels_drawboard(bj); | 1030 | jewels_drawboard(bj); |
1031 | } | 1031 | } |
1032 | 1032 | ||
@@ -1165,7 +1165,7 @@ static void jewels_savegame(struct game_context* bj) { | |||
1165 | static void jewels_callback(void* param) { | 1165 | static void jewels_callback(void* param) { |
1166 | struct game_context* bj = (struct game_context*) param; | 1166 | struct game_context* bj = (struct game_context*) param; |
1167 | if(bj->dirty) { | 1167 | if(bj->dirty) { |
1168 | rb->splash(HZ, true, "Saving high scores..."); | 1168 | rb->splash(HZ, "Saving high scores..."); |
1169 | jewels_savescores(bj); | 1169 | jewels_savescores(bj); |
1170 | } | 1170 | } |
1171 | } | 1171 | } |
@@ -1211,7 +1211,7 @@ static int jewels_main(struct game_context* bj) { | |||
1211 | 1211 | ||
1212 | case MRES_RESUME: | 1212 | case MRES_RESUME: |
1213 | if(!jewels_loadgame(bj)) { | 1213 | if(!jewels_loadgame(bj)) { |
1214 | rb->splash(HZ*2, true, "Nothing to resume"); | 1214 | rb->splash(HZ*2, "Nothing to resume"); |
1215 | rb->lcd_clear_display(); | 1215 | rb->lcd_clear_display(); |
1216 | } else { | 1216 | } else { |
1217 | startgame = true; | 1217 | startgame = true; |
@@ -1438,7 +1438,7 @@ static int jewels_main(struct game_context* bj) { | |||
1438 | break; | 1438 | break; |
1439 | 1439 | ||
1440 | case MRES_SAVE: | 1440 | case MRES_SAVE: |
1441 | rb->splash(HZ, true, "Saving game..."); | 1441 | rb->splash(HZ, "Saving game..."); |
1442 | jewels_savegame(bj); | 1442 | jewels_savegame(bj); |
1443 | return BJ_END; | 1443 | return BJ_END; |
1444 | 1444 | ||
@@ -1602,14 +1602,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
1602 | while(!exit) { | 1602 | while(!exit) { |
1603 | switch(jewels_main(&bj)){ | 1603 | switch(jewels_main(&bj)){ |
1604 | case BJ_LOSE: | 1604 | case BJ_LOSE: |
1605 | rb->splash(HZ*2, true, "No more moves!"); | 1605 | rb->splash(HZ*2, "No more moves!"); |
1606 | /* fall through to BJ_END */ | 1606 | /* fall through to BJ_END */ |
1607 | 1607 | ||
1608 | case BJ_END: | 1608 | case BJ_END: |
1609 | if(!bj.resume) { | 1609 | if(!bj.resume) { |
1610 | if((position = jewels_recordscore(&bj))) { | 1610 | if((position = jewels_recordscore(&bj))) { |
1611 | rb->snprintf(str, 19, "New high score #%d!", position); | 1611 | rb->snprintf(str, 19, "New high score #%d!", position); |
1612 | rb->splash(HZ*2, true, str); | 1612 | rb->splash(HZ*2, str); |
1613 | } | 1613 | } |
1614 | } | 1614 | } |
1615 | break; | 1615 | break; |
@@ -1620,7 +1620,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
1620 | 1620 | ||
1621 | case BJ_QUIT: | 1621 | case BJ_QUIT: |
1622 | if(bj.dirty) { | 1622 | if(bj.dirty) { |
1623 | rb->splash(HZ, true, "Saving high scores..."); | 1623 | rb->splash(HZ, "Saving high scores..."); |
1624 | jewels_savescores(&bj); | 1624 | jewels_savescores(&bj); |
1625 | } | 1625 | } |
1626 | exit = true; | 1626 | exit = true; |
@@ -1630,11 +1630,11 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
1630 | if(!bj.resume) { | 1630 | if(!bj.resume) { |
1631 | if((position = jewels_recordscore(&bj))) { | 1631 | if((position = jewels_recordscore(&bj))) { |
1632 | rb->snprintf(str, 19, "New high score #%d!", position); | 1632 | rb->snprintf(str, 19, "New high score #%d!", position); |
1633 | rb->splash(HZ*2, true, str); | 1633 | rb->splash(HZ*2, str); |
1634 | } | 1634 | } |
1635 | } | 1635 | } |
1636 | if(bj.dirty) { | 1636 | if(bj.dirty) { |
1637 | rb->splash(HZ, true, "Saving high scores..."); | 1637 | rb->splash(HZ, "Saving high scores..."); |
1638 | jewels_savescores(&bj); | 1638 | jewels_savescores(&bj); |
1639 | } | 1639 | } |
1640 | exit = true; | 1640 | exit = true; |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index f96c954e54..c6cb2701c0 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -2083,7 +2083,7 @@ int change_filename(int direct) | |||
2083 | 2083 | ||
2084 | if(count == entries && file_pt[curfile] == '\0') | 2084 | if(count == entries && file_pt[curfile] == '\0') |
2085 | { | 2085 | { |
2086 | rb->splash(HZ,true,"No supported files"); | 2086 | rb->splash(HZ, "No supported files"); |
2087 | return PLUGIN_ERROR; | 2087 | return PLUGIN_ERROR; |
2088 | } | 2088 | } |
2089 | if(rb->strlen(tree->currdir) > 1) | 2089 | if(rb->strlen(tree->currdir) > 1) |
@@ -2557,7 +2557,7 @@ struct t_disp* get_image(struct jpeg* p_jpg, int ds) | |||
2557 | #endif | 2557 | #endif |
2558 | if (status) | 2558 | if (status) |
2559 | { | 2559 | { |
2560 | rb->splash(HZ, true, "decode error %d", status); | 2560 | rb->splash(HZ, "decode error %d", status); |
2561 | file_pt[curfile] = '\0'; | 2561 | file_pt[curfile] = '\0'; |
2562 | return NULL; | 2562 | return NULL; |
2563 | } | 2563 | } |
@@ -2619,7 +2619,7 @@ int load_and_show(char* filename) | |||
2619 | if (fd < 0) | 2619 | if (fd < 0) |
2620 | { | 2620 | { |
2621 | rb->snprintf(print,sizeof(print),"err opening %s:%d",filename,fd); | 2621 | rb->snprintf(print,sizeof(print),"err opening %s:%d",filename,fd); |
2622 | rb->splash(HZ, true, print); | 2622 | rb->splash(HZ, print); |
2623 | return PLUGIN_ERROR; | 2623 | return PLUGIN_ERROR; |
2624 | } | 2624 | } |
2625 | filesize = rb->filesize(fd); | 2625 | filesize = rb->filesize(fd); |
@@ -2696,7 +2696,7 @@ int load_and_show(char* filename) | |||
2696 | else | 2696 | else |
2697 | #endif | 2697 | #endif |
2698 | { | 2698 | { |
2699 | rb->splash(HZ, true, "Out of Memory"); | 2699 | rb->splash(HZ, "Out of Memory"); |
2700 | rb->close(fd); | 2700 | rb->close(fd); |
2701 | return PLUGIN_ERROR; | 2701 | return PLUGIN_ERROR; |
2702 | } | 2702 | } |
@@ -2743,7 +2743,7 @@ int load_and_show(char* filename) | |||
2743 | 2743 | ||
2744 | if (status < 0 || (status & (DQT | SOF0)) != (DQT | SOF0)) | 2744 | if (status < 0 || (status & (DQT | SOF0)) != (DQT | SOF0)) |
2745 | { /* bad format or minimum components not contained */ | 2745 | { /* bad format or minimum components not contained */ |
2746 | rb->splash(HZ, true, "unsupported %d", status); | 2746 | rb->splash(HZ, "unsupported %d", status); |
2747 | file_pt[curfile] = '\0'; | 2747 | file_pt[curfile] = '\0'; |
2748 | return change_filename(direction); | 2748 | return change_filename(direction); |
2749 | } | 2749 | } |
@@ -2762,7 +2762,7 @@ int load_and_show(char* filename) | |||
2762 | ds_min = min_downscale(&jpg, buf_size); /* check memory constraint */ | 2762 | ds_min = min_downscale(&jpg, buf_size); /* check memory constraint */ |
2763 | if (ds_min == 0) | 2763 | if (ds_min == 0) |
2764 | { | 2764 | { |
2765 | rb->splash(HZ, true, "too large"); | 2765 | rb->splash(HZ, "too large"); |
2766 | file_pt[curfile] = '\0'; | 2766 | file_pt[curfile] = '\0'; |
2767 | return change_filename(direction); | 2767 | return change_filename(direction); |
2768 | } | 2768 | } |
@@ -2902,7 +2902,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
2902 | buf_size -= graysize; | 2902 | buf_size -= graysize; |
2903 | if (grayscales < 33 || buf_size <= 0) | 2903 | if (grayscales < 33 || buf_size <= 0) |
2904 | { | 2904 | { |
2905 | rb->splash(HZ, true, "gray buf error"); | 2905 | rb->splash(HZ, "gray buf error"); |
2906 | return PLUGIN_ERROR; | 2906 | return PLUGIN_ERROR; |
2907 | } | 2907 | } |
2908 | #else | 2908 | #else |
diff --git a/apps/plugins/lib/overlay.c b/apps/plugins/lib/overlay.c index 91f08e23f0..edae36671f 100644 --- a/apps/plugins/lib/overlay.c +++ b/apps/plugins/lib/overlay.c | |||
@@ -54,7 +54,7 @@ enum plugin_status run_overlay(struct plugin_api* rb, void* parameter, | |||
54 | fd = rb->open(filename, O_RDONLY); | 54 | fd = rb->open(filename, O_RDONLY); |
55 | if (fd < 0) | 55 | if (fd < 0) |
56 | { | 56 | { |
57 | rb->splash(2*HZ, true, "Can't open %s", filename); | 57 | rb->splash(2*HZ, "Can't open %s", filename); |
58 | return PLUGIN_ERROR; | 58 | return PLUGIN_ERROR; |
59 | } | 59 | } |
60 | readsize = rb->read(fd, &header, sizeof(header)); | 60 | readsize = rb->read(fd, &header, sizeof(header)); |
@@ -64,17 +64,17 @@ enum plugin_status run_overlay(struct plugin_api* rb, void* parameter, | |||
64 | 64 | ||
65 | if (readsize != sizeof(header)) | 65 | if (readsize != sizeof(header)) |
66 | { | 66 | { |
67 | rb->splash(2*HZ, true, "Reading %s overlay failed.", name); | 67 | rb->splash(2*HZ, "Reading %s overlay failed.", name); |
68 | return PLUGIN_ERROR; | 68 | return PLUGIN_ERROR; |
69 | } | 69 | } |
70 | if (header.magic != PLUGIN_MAGIC || header.target_id != TARGET_ID) | 70 | if (header.magic != PLUGIN_MAGIC || header.target_id != TARGET_ID) |
71 | { | 71 | { |
72 | rb->splash(2*HZ, true, "%s overlay: Incompatible model.", name); | 72 | rb->splash(2*HZ, "%s overlay: Incompatible model.", name); |
73 | return PLUGIN_ERROR; | 73 | return PLUGIN_ERROR; |
74 | } | 74 | } |
75 | if (header.api_version != PLUGIN_API_VERSION) | 75 | if (header.api_version != PLUGIN_API_VERSION) |
76 | { | 76 | { |
77 | rb->splash(2*HZ, true, "%s overlay: Incompatible version.", name); | 77 | rb->splash(2*HZ, "%s overlay: Incompatible version.", name); |
78 | return PLUGIN_ERROR; | 78 | return PLUGIN_ERROR; |
79 | } | 79 | } |
80 | 80 | ||
@@ -82,14 +82,14 @@ enum plugin_status run_overlay(struct plugin_api* rb, void* parameter, | |||
82 | if (header.load_addr < audiobuf || | 82 | if (header.load_addr < audiobuf || |
83 | header.end_addr > audiobuf + audiobuf_size) | 83 | header.end_addr > audiobuf + audiobuf_size) |
84 | { | 84 | { |
85 | rb->splash(2*HZ, true, "%s overlay doesn't fit into memory.", name); | 85 | rb->splash(2*HZ, "%s overlay doesn't fit into memory.", name); |
86 | return PLUGIN_ERROR; | 86 | return PLUGIN_ERROR; |
87 | } | 87 | } |
88 | 88 | ||
89 | fd = rb->open(filename, O_RDONLY); | 89 | fd = rb->open(filename, O_RDONLY); |
90 | if (fd < 0) | 90 | if (fd < 0) |
91 | { | 91 | { |
92 | rb->splash(2*HZ, true, "Can't open %s", filename); | 92 | rb->splash(2*HZ, "Can't open %s", filename); |
93 | return PLUGIN_ERROR; | 93 | return PLUGIN_ERROR; |
94 | } | 94 | } |
95 | readsize = rb->read(fd, header.load_addr, header.end_addr - header.load_addr); | 95 | readsize = rb->read(fd, header.load_addr, header.end_addr - header.load_addr); |
@@ -97,7 +97,7 @@ enum plugin_status run_overlay(struct plugin_api* rb, void* parameter, | |||
97 | 97 | ||
98 | if (readsize < 0) | 98 | if (readsize < 0) |
99 | { | 99 | { |
100 | rb->splash(2*HZ, true, "Reading %s overlay failed.", name); | 100 | rb->splash(2*HZ, "Reading %s overlay failed.", name); |
101 | return PLUGIN_ERROR; | 101 | return PLUGIN_ERROR; |
102 | } | 102 | } |
103 | /* Zero out bss area */ | 103 | /* Zero out bss area */ |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 251c6cb259..68b8bc4b93 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -259,7 +259,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
259 | 259 | ||
260 | #ifdef HAVE_LCD_CHARCELLS | 260 | #ifdef HAVE_LCD_CHARCELLS |
261 | if (!pgfx_init(rb, 4, 2)) { | 261 | if (!pgfx_init(rb, 4, 2)) { |
262 | rb->splash(HZ*2, true, "Old LCD :("); | 262 | rb->splash(HZ*2, "Old LCD :("); |
263 | return PLUGIN_OK; | 263 | return PLUGIN_OK; |
264 | } | 264 | } |
265 | #endif | 265 | #endif |
diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c index cd7446eee2..8a737d235e 100644 --- a/apps/plugins/mazezam.c +++ b/apps/plugins/mazezam.c | |||
@@ -705,7 +705,7 @@ static enum level_state level_loop(short level, short lives) { | |||
705 | */ | 705 | */ |
706 | rb->lcd_remote_clear_display(); | 706 | rb->lcd_remote_clear_display(); |
707 | #endif | 707 | #endif |
708 | rb->splash(MAZEZAM_LEVEL_LIVES_DELAY, true, MAZEZAM_LEVEL_LIVES_TEXT, level+1, lives); | 708 | rb->splash(MAZEZAM_LEVEL_LIVES_DELAY, MAZEZAM_LEVEL_LIVES_TEXT, level+1, lives); |
709 | 709 | ||
710 | /* ensure keys pressed during the splash screen are ignored */ | 710 | /* ensure keys pressed during the splash screen are ignored */ |
711 | rb->button_clear_queue(); | 711 | rb->button_clear_queue(); |
@@ -844,7 +844,7 @@ static enum game_state game_loop(struct resume_data *r) { | |||
844 | */ | 844 | */ |
845 | rb->lcd_remote_clear_display(); | 845 | rb->lcd_remote_clear_display(); |
846 | #endif | 846 | #endif |
847 | rb->splash(MAZEZAM_GAMEOVER_DELAY, true, MAZEZAM_GAMEOVER_TEXT); | 847 | rb->splash(MAZEZAM_GAMEOVER_DELAY, MAZEZAM_GAMEOVER_TEXT); |
848 | break; | 848 | break; |
849 | 849 | ||
850 | case GAME_STATE_COMPLETED: | 850 | case GAME_STATE_COMPLETED: |
diff --git a/apps/plugins/midi/guspat.c b/apps/plugins/midi/guspat.c index 509a864528..716c20d99e 100644 --- a/apps/plugins/midi/guspat.c +++ b/apps/plugins/midi/guspat.c | |||
@@ -146,7 +146,7 @@ struct GPatch * gusload(char * filename) | |||
146 | { | 146 | { |
147 | char message[50]; | 147 | char message[50]; |
148 | rb->snprintf(message, 50, "Error opening %s", filename); | 148 | rb->snprintf(message, 50, "Error opening %s", filename); |
149 | rb->splash(HZ*2, true, message); | 149 | rb->splash(HZ*2, message); |
150 | return NULL; | 150 | return NULL; |
151 | } | 151 | } |
152 | 152 | ||
diff --git a/apps/plugins/midi/synth.c b/apps/plugins/midi/synth.c index f65a062c43..78aaab18f4 100644 --- a/apps/plugins/midi/synth.c +++ b/apps/plugins/midi/synth.c | |||
@@ -92,7 +92,7 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig) | |||
92 | if(mf->tracks[a] == NULL) | 92 | if(mf->tracks[a] == NULL) |
93 | { | 93 | { |
94 | printf("\nNULL TRACK !!!"); | 94 | printf("\nNULL TRACK !!!"); |
95 | rb->splash(HZ*2, true, "Null Track in loader."); | 95 | rb->splash(HZ*2, "Null Track in loader."); |
96 | return -1; | 96 | return -1; |
97 | } | 97 | } |
98 | 98 | ||
@@ -115,8 +115,7 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig) | |||
115 | printf("\nPlease install the instruments."); | 115 | printf("\nPlease install the instruments."); |
116 | printf("\nSee Rockbox page for more info."); | 116 | printf("\nSee Rockbox page for more info."); |
117 | 117 | ||
118 | rb->splash(HZ*2, true, "No Instruments"); | 118 | rb->splash(HZ*2, "No Instruments"); |
119 | rb->splash(HZ*2, true, "No Instruments"); | ||
120 | return -1; | 119 | return -1; |
121 | } | 120 | } |
122 | 121 | ||
@@ -151,7 +150,7 @@ int initSynth(struct MIDIfile * mf, char * filename, char * drumConfig) | |||
151 | file = rb->open(drumConfig, O_RDONLY); | 150 | file = rb->open(drumConfig, O_RDONLY); |
152 | if(file < 0) | 151 | if(file < 0) |
153 | { | 152 | { |
154 | rb->splash(HZ*2, true, "Bad drum config.\nDid you install the patchset?"); | 153 | rb->splash(HZ*2, "Bad drum config. Did you install the patchset?"); |
155 | return -1; | 154 | return -1; |
156 | } | 155 | } |
157 | 156 | ||
diff --git a/apps/plugins/midi2wav.c b/apps/plugins/midi2wav.c index d4d5166fe0..368c8b9125 100644 --- a/apps/plugins/midi2wav.c +++ b/apps/plugins/midi2wav.c | |||
@@ -74,16 +74,16 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
74 | 74 | ||
75 | if(parameter == NULL) | 75 | if(parameter == NULL) |
76 | { | 76 | { |
77 | rb->splash(HZ*2, true, " Play .MID file "); | 77 | rb->splash(HZ*2, "Play .MID file"); |
78 | return PLUGIN_OK; | 78 | return PLUGIN_OK; |
79 | } | 79 | } |
80 | 80 | ||
81 | rb->splash(HZ, true, parameter); | 81 | rb->splash(HZ, parameter); |
82 | if(midimain(parameter) == -1) | 82 | if(midimain(parameter) == -1) |
83 | { | 83 | { |
84 | return PLUGIN_ERROR; | 84 | return PLUGIN_ERROR; |
85 | } | 85 | } |
86 | rb->splash(HZ*3, true, "FINISHED PLAYING"); | 86 | rb->splash(HZ*3, "FINISHED PLAYING"); |
87 | /* Return PLUGIN_USB_CONNECTED to force a file-tree refresh */ | 87 | /* Return PLUGIN_USB_CONNECTED to force a file-tree refresh */ |
88 | return PLUGIN_USB_CONNECTED; | 88 | return PLUGIN_USB_CONNECTED; |
89 | } | 89 | } |
@@ -102,11 +102,11 @@ int midimain(void * filename) | |||
102 | 102 | ||
103 | printf("\nHello.\n"); | 103 | printf("\nHello.\n"); |
104 | 104 | ||
105 | rb->splash(HZ/5, true, "LOADING MIDI"); | 105 | rb->splash(HZ/5, "LOADING MIDI"); |
106 | 106 | ||
107 | struct MIDIfile * mf = loadFile(filename); | 107 | struct MIDIfile * mf = loadFile(filename); |
108 | 108 | ||
109 | rb->splash(HZ/5, true, "LOADING PATCHES"); | 109 | rb->splash(HZ/5, "LOADING PATCHES"); |
110 | if (initSynth(mf, "/.rockbox/patchset/patchset.cfg", "/.rockbox/patchset/drums.cfg") == -1) | 110 | if (initSynth(mf, "/.rockbox/patchset/patchset.cfg", "/.rockbox/patchset/drums.cfg") == -1) |
111 | { | 111 | { |
112 | return -1; | 112 | return -1; |
@@ -153,7 +153,7 @@ int midimain(void * filename) | |||
153 | #endif | 153 | #endif |
154 | 154 | ||
155 | 155 | ||
156 | rb->splash(HZ/5, true, " I hope this works... "); | 156 | rb->splash(HZ/5, "I hope this works..."); |
157 | 157 | ||
158 | 158 | ||
159 | 159 | ||
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 2500fed8ce..26565f335f 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -650,7 +650,7 @@ enum minesweeper_status minesweeper( void ) | |||
650 | if( no_mines ) | 650 | if( no_mines ) |
651 | break; | 651 | break; |
652 | tiles_left = count_tiles_left(); | 652 | tiles_left = count_tiles_left(); |
653 | rb->splash( HZ*2, true, "You found %d mines out of %d", | 653 | rb->splash( HZ*2, "You found %d mines out of %d", |
654 | tiles_left, mine_num ); | 654 | tiles_left, mine_num ); |
655 | break; | 655 | break; |
656 | 656 | ||
@@ -681,13 +681,13 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
681 | switch( minesweeper() ) | 681 | switch( minesweeper() ) |
682 | { | 682 | { |
683 | case MINESWEEPER_WIN: | 683 | case MINESWEEPER_WIN: |
684 | rb->splash( HZ, true, "You Win!" ); | 684 | rb->splash( HZ, "You Win!" ); |
685 | rb->lcd_clear_display(); | 685 | rb->lcd_clear_display(); |
686 | mine_show(); | 686 | mine_show(); |
687 | break; | 687 | break; |
688 | 688 | ||
689 | case MINESWEEPER_LOSE: | 689 | case MINESWEEPER_LOSE: |
690 | rb->splash( HZ, true, "You Lose!" ); | 690 | rb->splash( HZ, "You Lose!" ); |
691 | rb->lcd_clear_display(); | 691 | rb->lcd_clear_display(); |
692 | mine_show(); | 692 | mine_show(); |
693 | break; | 693 | break; |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index dca2c304b0..093e642703 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -116,7 +116,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
116 | #ifdef HAVE_LCD_CHARCELLS | 116 | #ifdef HAVE_LCD_CHARCELLS |
117 | if (!pgfx_init(rb, 4, 2)) | 117 | if (!pgfx_init(rb, 4, 2)) |
118 | { | 118 | { |
119 | rb->splash(HZ*2, true, "Old LCD :("); | 119 | rb->splash(HZ*2, "Old LCD :("); |
120 | return PLUGIN_OK; | 120 | return PLUGIN_OK; |
121 | } | 121 | } |
122 | pgfx_display(3, 0); | 122 | pgfx_display(3, 0); |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 684a491872..f292e3dbb3 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -354,10 +354,10 @@ static void get_next_data( Stream* str ) | |||
354 | } else if ((p[4] & 0xf0) == 0x20) { /* mpeg-1 */ | 354 | } else if ((p[4] & 0xf0) == 0x20) { /* mpeg-1 */ |
355 | p += 12; | 355 | p += 12; |
356 | } else { | 356 | } else { |
357 | rb->splash( 30, true, "Weird Pack header!" ); | 357 | rb->splash( 30, "Weird Pack header!" ); |
358 | p += 5; | 358 | p += 5; |
359 | } | 359 | } |
360 | /*rb->splash( 30, true, "Pack header" );*/ | 360 | /*rb->splash( 30, "Pack header" );*/ |
361 | } | 361 | } |
362 | 362 | ||
363 | /* System header, parse and skip it */ | 363 | /* System header, parse and skip it */ |
@@ -370,14 +370,14 @@ static void get_next_data( Stream* str ) | |||
370 | header_length += *(p++); | 370 | header_length += *(p++); |
371 | 371 | ||
372 | p += header_length; | 372 | p += header_length; |
373 | /*rb->splash( 30, true, "System header" );*/ | 373 | /*rb->splash( 30, "System header" );*/ |
374 | } | 374 | } |
375 | 375 | ||
376 | /* Packet header, parse it */ | 376 | /* Packet header, parse it */ |
377 | if( rb->memcmp (p, packet_start_code_prefix, sizeof (packet_start_code_prefix)) != 0 ) | 377 | if( rb->memcmp (p, packet_start_code_prefix, sizeof (packet_start_code_prefix)) != 0 ) |
378 | { | 378 | { |
379 | /* Problem */ | 379 | /* Problem */ |
380 | //rb->splash( HZ*3, true, "missing packet start code prefix : %X%X at %X", *p, *(p+2), p-disk_buf ); | 380 | //rb->splash( HZ*3, "missing packet start code prefix : %X%X at %X", *p, *(p+2), p-disk_buf ); |
381 | str->curr_packet_end = str->curr_packet = NULL; | 381 | str->curr_packet_end = str->curr_packet = NULL; |
382 | return; | 382 | return; |
383 | //++p; | 383 | //++p; |
@@ -389,7 +389,7 @@ static void get_next_data( Stream* str ) | |||
389 | length = (*(p+4)) << 8; | 389 | length = (*(p+4)) << 8; |
390 | length += *(p+5); | 390 | length += *(p+5); |
391 | 391 | ||
392 | /*rb->splash( 100, true, "Stream : %X", stream );*/ | 392 | /*rb->splash( 100, "Stream : %X", stream );*/ |
393 | if (stream != str->id) | 393 | if (stream != str->id) |
394 | { | 394 | { |
395 | /* End of stream ? */ | 395 | /* End of stream ? */ |
@@ -436,7 +436,7 @@ static void get_next_data( Stream* str ) | |||
436 | length++; | 436 | length++; |
437 | if (length > 23) | 437 | if (length > 23) |
438 | { | 438 | { |
439 | rb->splash( 30, true, "Too much stuffing" ); | 439 | rb->splash( 30, "Too much stuffing" ); |
440 | break; | 440 | break; |
441 | } | 441 | } |
442 | } | 442 | } |
@@ -551,7 +551,7 @@ static void mad_decode(void) | |||
551 | } | 551 | } |
552 | len = audio_str.curr_packet_end - audio_str.curr_packet; | 552 | len = audio_str.curr_packet_end - audio_str.curr_packet; |
553 | if (n + len > mpa_buffer_size) { | 553 | if (n + len > mpa_buffer_size) { |
554 | rb->splash( 30, true, "Audio buffer overflow" ); | 554 | rb->splash( 30, "Audio buffer overflow" ); |
555 | audiostatus=STREAM_DONE; | 555 | audiostatus=STREAM_DONE; |
556 | /* Wait to be killed */ | 556 | /* Wait to be killed */ |
557 | for (;;) { rb->sleep(HZ); } | 557 | for (;;) { rb->sleep(HZ); } |
@@ -898,7 +898,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
898 | 898 | ||
899 | eta = 0; | 899 | eta = 0; |
900 | 900 | ||
901 | rb->splash(0,true,"Buffering..."); | 901 | rb->splash(0, "Buffering..."); |
902 | 902 | ||
903 | disk_buf_end = buffer + rb->read (in_file, buffer, buffer_size); | 903 | disk_buf_end = buffer + rb->read (in_file, buffer, buffer_size); |
904 | disk_buf = buffer; | 904 | disk_buf = buffer; |
@@ -913,7 +913,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
913 | (uint8_t*)video_stack,VIDEO_STACKSIZE,"mpgvideo" IF_PRIO(,PRIORITY_PLAYBACK) | 913 | (uint8_t*)video_stack,VIDEO_STACKSIZE,"mpgvideo" IF_PRIO(,PRIORITY_PLAYBACK) |
914 | IF_COP(, COP, true))) == NULL) | 914 | IF_COP(, COP, true))) == NULL) |
915 | { | 915 | { |
916 | rb->splash(HZ,true,"Cannot create video thread!"); | 916 | rb->splash(HZ, "Cannot create video thread!"); |
917 | return PLUGIN_ERROR; | 917 | return PLUGIN_ERROR; |
918 | } | 918 | } |
919 | 919 | ||
@@ -921,7 +921,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
921 | (uint8_t*)audio_stack,AUDIO_STACKSIZE,"mpgaudio" IF_PRIO(,PRIORITY_PLAYBACK) | 921 | (uint8_t*)audio_stack,AUDIO_STACKSIZE,"mpgaudio" IF_PRIO(,PRIORITY_PLAYBACK) |
922 | IF_COP(, CPU, false))) == NULL) | 922 | IF_COP(, CPU, false))) == NULL) |
923 | { | 923 | { |
924 | rb->splash(HZ,true,"Cannot create audio thread!"); | 924 | rb->splash(HZ, "Cannot create audio thread!"); |
925 | rb->remove_thread(videothread_id); | 925 | rb->remove_thread(videothread_id); |
926 | return PLUGIN_ERROR; | 926 | return PLUGIN_ERROR; |
927 | } | 927 | } |
diff --git a/apps/plugins/nim.c b/apps/plugins/nim.c index d937af168b..b309e296c0 100644 --- a/apps/plugins/nim.c +++ b/apps/plugins/nim.c | |||
@@ -156,7 +156,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
156 | hsmile=rb->lcd_get_locked_pattern(); | 156 | hsmile=rb->lcd_get_locked_pattern(); |
157 | 157 | ||
158 | 158 | ||
159 | rb->splash(HZ, true, "NIM V1.2"); | 159 | rb->splash(HZ, "NIM V1.2"); |
160 | rb->lcd_clear_display(); | 160 | rb->lcd_clear_display(); |
161 | 161 | ||
162 | /* Main loop */ | 162 | /* Main loop */ |
diff --git a/apps/plugins/pacbox/pacbox.c b/apps/plugins/pacbox/pacbox.c index 4c539c593f..3a56430106 100644 --- a/apps/plugins/pacbox/pacbox.c +++ b/apps/plugins/pacbox/pacbox.c | |||
@@ -412,13 +412,13 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
412 | 412 | ||
413 | /* Save the user settings if they have changed */ | 413 | /* Save the user settings if they have changed */ |
414 | if (rb->memcmp(&settings,&old_settings,sizeof(settings))!=0) { | 414 | if (rb->memcmp(&settings,&old_settings,sizeof(settings))!=0) { |
415 | rb->splash(0,true,"Saving settings..."); | 415 | rb->splash(0, "Saving settings..."); |
416 | configfile_save(SETTINGS_FILENAME, config, | 416 | configfile_save(SETTINGS_FILENAME, config, |
417 | sizeof(config)/sizeof(*config), | 417 | sizeof(config)/sizeof(*config), |
418 | SETTINGS_VERSION); | 418 | SETTINGS_VERSION); |
419 | } | 419 | } |
420 | } else { | 420 | } else { |
421 | rb->splash(HZ*2,true,"No ROMs in /.rockbox/pacman/"); | 421 | rb->splash(HZ*2, "No ROMs in /.rockbox/pacman/"); |
422 | } | 422 | } |
423 | 423 | ||
424 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | 424 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index a0889b8281..b799a0a37a 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -245,7 +245,7 @@ void bounce(struct pong *p, int pad, int info) | |||
245 | 245 | ||
246 | void score(struct pong *p, int pad) | 246 | void score(struct pong *p, int pad) |
247 | { | 247 | { |
248 | rb->splash(HZ/4, true, "%s scores!", pad?"right":"left"); | 248 | rb->splash(HZ/4, "%s scores!", pad?"right":"left"); |
249 | rb->lcd_clear_display(); | 249 | rb->lcd_clear_display(); |
250 | p->score[pad]++; | 250 | p->score[pad]++; |
251 | 251 | ||
@@ -424,7 +424,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
424 | /* go go go */ | 424 | /* go go go */ |
425 | while(game > 0) { | 425 | while(game > 0) { |
426 | if (game == 2) { /* Game Paused */ | 426 | if (game == 2) { /* Game Paused */ |
427 | rb->splash(0, true, "PAUSED"); | 427 | rb->splash(0, "PAUSED"); |
428 | while(game == 2) | 428 | while(game == 2) |
429 | game = keys(&pong); /* short circuit */ | 429 | game = keys(&pong); /* short circuit */ |
430 | rb->lcd_clear_display(); | 430 | rb->lcd_clear_display(); |
diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c index 3b9f842873..cd3bf9f1c2 100644 --- a/apps/plugins/random_folder_advance_config.c +++ b/apps/plugins/random_folder_advance_config.c | |||
@@ -137,7 +137,7 @@ void generate(void) | |||
137 | rb->write(fd,&dirs_count,sizeof(int)); | 137 | rb->write(fd,&dirs_count,sizeof(int)); |
138 | if (fd < 0) | 138 | if (fd < 0) |
139 | { | 139 | { |
140 | rb->splash(HZ, true, "Couldnt open %s", RFA_FILE); | 140 | rb->splash(HZ, "Couldnt open %s", RFA_FILE); |
141 | return; | 141 | return; |
142 | } | 142 | } |
143 | #ifndef HAVE_LCD_CHARCELLS | 143 | #ifndef HAVE_LCD_CHARCELLS |
@@ -242,11 +242,11 @@ void edit_list(void) | |||
242 | { | 242 | { |
243 | case 0: | 243 | case 0: |
244 | exit = true; | 244 | exit = true; |
245 | rb->splash(HZ*2, true, "Saving " RFA_FILE); | 245 | rb->splash(HZ*2, "Saving " RFA_FILE); |
246 | fd = rb->open(RFA_FILE, O_CREAT|O_WRONLY); | 246 | fd = rb->open(RFA_FILE, O_CREAT|O_WRONLY); |
247 | if (fd < 0) | 247 | if (fd < 0) |
248 | { | 248 | { |
249 | rb->splash(HZ, true, "Could Not Open " RFA_FILE); | 249 | rb->splash(HZ, "Could Not Open " RFA_FILE); |
250 | break; | 250 | break; |
251 | } | 251 | } |
252 | dirs_count = 0; | 252 | dirs_count = 0; |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index b77c9b1143..c137814831 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -854,7 +854,7 @@ static int rockblox_loop (void) | |||
854 | /* Restore user's original backlight setting */ | 854 | /* Restore user's original backlight setting */ |
855 | rb->backlight_set_timeout (rb->global_settings->backlight_timeout); | 855 | rb->backlight_set_timeout (rb->global_settings->backlight_timeout); |
856 | 856 | ||
857 | rb->splash(0, true, "Paused"); | 857 | rb->splash(0, "Paused"); |
858 | while (rb->button_hold ()) | 858 | while (rb->button_hold ()) |
859 | rb->sleep(HZ/10); | 859 | rb->sleep(HZ/10); |
860 | 860 | ||
@@ -939,7 +939,7 @@ static int rockblox_loop (void) | |||
939 | break; | 939 | break; |
940 | #ifdef ROCKBLOX_RESTART | 940 | #ifdef ROCKBLOX_RESTART |
941 | case ROCKBLOX_RESTART: | 941 | case ROCKBLOX_RESTART: |
942 | rb->splash (HZ * 1, true, "Restarting..."); | 942 | rb->splash (HZ * 1, "Restarting..."); |
943 | init_rockblox (); | 943 | init_rockblox (); |
944 | new_block (); | 944 | new_block (); |
945 | break; | 945 | break; |
@@ -992,7 +992,7 @@ static int rockblox_loop (void) | |||
992 | #if LCD_DEPTH >= 2 | 992 | #if LCD_DEPTH >= 2 |
993 | rb->lcd_set_foreground (LCD_BLACK); | 993 | rb->lcd_set_foreground (LCD_BLACK); |
994 | #endif | 994 | #endif |
995 | rb->splash (HZ * 2, true, "Game Over"); | 995 | rb->splash (HZ * 2, "Game Over"); |
996 | init_rockblox (); | 996 | init_rockblox (); |
997 | new_block (); | 997 | new_block (); |
998 | } | 998 | } |
@@ -1025,7 +1025,7 @@ enum plugin_status plugin_start (struct plugin_api *api, void *parameter) | |||
1025 | #else | 1025 | #else |
1026 | if (!pgfx_init(rb, 4, 2)) | 1026 | if (!pgfx_init(rb, 4, 2)) |
1027 | { | 1027 | { |
1028 | rb->splash(HZ*2, true, "Old LCD :("); | 1028 | rb->splash(HZ*2, "Old LCD :("); |
1029 | return PLUGIN_OK; | 1029 | return PLUGIN_OK; |
1030 | } | 1030 | } |
1031 | #endif | 1031 | #endif |
diff --git a/apps/plugins/rockbox_flash.c b/apps/plugins/rockbox_flash.c index 0b713405ed..fbdfdbd7ee 100644 --- a/apps/plugins/rockbox_flash.c +++ b/apps/plugins/rockbox_flash.c | |||
@@ -652,14 +652,14 @@ void DoUserDialog(char* filename) | |||
652 | /* this can only work if Rockbox runs in DRAM, not flash ROM */ | 652 | /* this can only work if Rockbox runs in DRAM, not flash ROM */ |
653 | if ((UINT8*)rb >= FB && (UINT8*)rb < FB + 4096*1024) /* 4 MB max */ | 653 | if ((UINT8*)rb >= FB && (UINT8*)rb < FB + 4096*1024) /* 4 MB max */ |
654 | { /* we're running from flash */ | 654 | { /* we're running from flash */ |
655 | rb->splash(HZ*3, true, "Not from ROM"); | 655 | rb->splash(HZ*3, "Not from ROM"); |
656 | return; /* exit */ | 656 | return; /* exit */ |
657 | } | 657 | } |
658 | 658 | ||
659 | /* refuse to work if the power may fail meanwhile */ | 659 | /* refuse to work if the power may fail meanwhile */ |
660 | if (!rb->battery_level_safe()) | 660 | if (!rb->battery_level_safe()) |
661 | { | 661 | { |
662 | rb->splash(HZ*3, true, "Battery too low!"); | 662 | rb->splash(HZ*3, "Battery too low!"); |
663 | return; /* exit */ | 663 | return; /* exit */ |
664 | } | 664 | } |
665 | 665 | ||
@@ -667,7 +667,7 @@ void DoUserDialog(char* filename) | |||
667 | sector = rb->plugin_get_buffer(&memleft); | 667 | sector = rb->plugin_get_buffer(&memleft); |
668 | if (memleft < SECTORSIZE) /* need buffer for a flash sector */ | 668 | if (memleft < SECTORSIZE) /* need buffer for a flash sector */ |
669 | { | 669 | { |
670 | rb->splash(HZ*3, true, "Out of memory"); | 670 | rb->splash(HZ*3, "Out of memory"); |
671 | return; /* exit */ | 671 | return; /* exit */ |
672 | } | 672 | } |
673 | 673 | ||
@@ -681,12 +681,12 @@ void DoUserDialog(char* filename) | |||
681 | 681 | ||
682 | if (FlashInfo.size == 0) /* no valid chip */ | 682 | if (FlashInfo.size == 0) /* no valid chip */ |
683 | { | 683 | { |
684 | rb->splash(HZ*3, true, "Not flashable"); | 684 | rb->splash(HZ*3, "Not flashable"); |
685 | return; /* exit */ | 685 | return; /* exit */ |
686 | } | 686 | } |
687 | else if (pos == 0) | 687 | else if (pos == 0) |
688 | { | 688 | { |
689 | rb->splash(HZ*3, true, "No image"); | 689 | rb->splash(HZ*3, "No image"); |
690 | return; /* exit */ | 690 | return; /* exit */ |
691 | } | 691 | } |
692 | 692 | ||
@@ -855,14 +855,14 @@ void DoUserDialog(char* filename) | |||
855 | /* this can only work if Rockbox runs in DRAM, not flash ROM */ | 855 | /* this can only work if Rockbox runs in DRAM, not flash ROM */ |
856 | if ((UINT8*)rb >= FB && (UINT8*)rb < FB + 4096*1024) /* 4 MB max */ | 856 | if ((UINT8*)rb >= FB && (UINT8*)rb < FB + 4096*1024) /* 4 MB max */ |
857 | { /* we're running from flash */ | 857 | { /* we're running from flash */ |
858 | rb->splash(HZ*3, true, "Not from ROM"); | 858 | rb->splash(HZ*3, "Not from ROM"); |
859 | return; /* exit */ | 859 | return; /* exit */ |
860 | } | 860 | } |
861 | 861 | ||
862 | /* refuse to work if the power may fail meanwhile */ | 862 | /* refuse to work if the power may fail meanwhile */ |
863 | if (!rb->battery_level_safe()) | 863 | if (!rb->battery_level_safe()) |
864 | { | 864 | { |
865 | rb->splash(HZ*3, true, "Batt. too low!"); | 865 | rb->splash(HZ*3, "Batt. too low!"); |
866 | return; /* exit */ | 866 | return; /* exit */ |
867 | } | 867 | } |
868 | 868 | ||
@@ -870,7 +870,7 @@ void DoUserDialog(char* filename) | |||
870 | sector = rb->plugin_get_buffer(&memleft); | 870 | sector = rb->plugin_get_buffer(&memleft); |
871 | if (memleft < SECTORSIZE) /* need buffer for a flash sector */ | 871 | if (memleft < SECTORSIZE) /* need buffer for a flash sector */ |
872 | { | 872 | { |
873 | rb->splash(HZ*3, true, "Out of memory"); | 873 | rb->splash(HZ*3, "Out of memory"); |
874 | return; /* exit */ | 874 | return; /* exit */ |
875 | } | 875 | } |
876 | 876 | ||
@@ -879,12 +879,12 @@ void DoUserDialog(char* filename) | |||
879 | 879 | ||
880 | if (FlashInfo.size == 0) /* no valid chip */ | 880 | if (FlashInfo.size == 0) /* no valid chip */ |
881 | { | 881 | { |
882 | rb->splash(HZ*3, true, "Not flashable"); | 882 | rb->splash(HZ*3, "Not flashable"); |
883 | return; /* exit */ | 883 | return; /* exit */ |
884 | } | 884 | } |
885 | else if (pos == 0) | 885 | else if (pos == 0) |
886 | { | 886 | { |
887 | rb->splash(HZ*3, true, "No image"); | 887 | rb->splash(HZ*3, "No image"); |
888 | return; /* exit */ | 888 | return; /* exit */ |
889 | } | 889 | } |
890 | 890 | ||
@@ -1016,7 +1016,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1016 | 1016 | ||
1017 | if (parameter == NULL) | 1017 | if (parameter == NULL) |
1018 | { | 1018 | { |
1019 | rb->splash(HZ*3, true, "Play .ucl file!"); | 1019 | rb->splash(HZ*3, "Play .ucl file!"); |
1020 | return PLUGIN_OK; | 1020 | return PLUGIN_OK; |
1021 | } | 1021 | } |
1022 | 1022 | ||
diff --git a/apps/plugins/rockboy/cpu.c b/apps/plugins/rockboy/cpu.c index 00cfc42684..2bf9e90d2b 100644 --- a/apps/plugins/rockboy/cpu.c +++ b/apps/plugins/rockboy/cpu.c | |||
@@ -928,7 +928,7 @@ next: | |||
928 | byte *ptr=mbc.rmap[PC>>12]; | 928 | byte *ptr=mbc.rmap[PC>>12]; |
929 | snprintf(meow,499,"PC: 0x%x 0x%x a: 0x%x\n", | 929 | snprintf(meow,499,"PC: 0x%x 0x%x a: 0x%x\n", |
930 | ptr,PC, b ? b->address.d : 0); | 930 | ptr,PC, b ? b->address.d : 0); |
931 | rb->splash(HZ*2,true,meow); | 931 | rb->splash(HZ*2,meow); |
932 | while(b&&b->address.d!=((unsigned int)(ptr)+PC)) | 932 | while(b&&b->address.d!=((unsigned int)(ptr)+PC)) |
933 | { | 933 | { |
934 | p=b; | 934 | p=b; |
diff --git a/apps/plugins/rockboy/dynarec.c b/apps/plugins/rockboy/dynarec.c index 6ab1ec79b4..7c466de986 100644 --- a/apps/plugins/rockboy/dynarec.c +++ b/apps/plugins/rockboy/dynarec.c | |||
@@ -433,7 +433,7 @@ void dynamic_recompile (struct dynarec_block *newblock) | |||
433 | } | 433 | } |
434 | #endif | 434 | #endif |
435 | snprintf(meow,499,"Recompiling 0x%x",oldpc); | 435 | snprintf(meow,499,"Recompiling 0x%x",oldpc); |
436 | rb->splash(HZ*1,1,meow); | 436 | rb->splash(HZ*1,meow); |
437 | while(!done) | 437 | while(!done) |
438 | { | 438 | { |
439 | #ifdef DYNA_DEBUG | 439 | #ifdef DYNA_DEBUG |
diff --git a/apps/plugins/rockboy/loader.c b/apps/plugins/rockboy/loader.c index 8166220c8e..1317362c2c 100644 --- a/apps/plugins/rockboy/loader.c +++ b/apps/plugins/rockboy/loader.c | |||
@@ -189,10 +189,10 @@ int sram_load(void) | |||
189 | 189 | ||
190 | fd = open(sramfile, O_RDONLY); | 190 | fd = open(sramfile, O_RDONLY); |
191 | snprintf(meow,499,"Opening %s %d",sramfile,fd); | 191 | snprintf(meow,499,"Opening %s %d",sramfile,fd); |
192 | rb->splash(HZ*2, true, meow); | 192 | rb->splash(HZ*2, meow); |
193 | if (fd<0) return -1; | 193 | if (fd<0) return -1; |
194 | snprintf(meow,499,"Loading savedata from %s",sramfile); | 194 | snprintf(meow,499,"Loading savedata from %s",sramfile); |
195 | rb->splash(HZ*2, true, meow); | 195 | rb->splash(HZ*2, meow); |
196 | read(fd,ram.sbank, 8192*mbc.ramsize); | 196 | read(fd,ram.sbank, 8192*mbc.ramsize); |
197 | close(fd); | 197 | close(fd); |
198 | 198 | ||
@@ -211,7 +211,7 @@ int sram_save(void) | |||
211 | fd = open(sramfile, O_WRONLY|O_CREAT|O_TRUNC); | 211 | fd = open(sramfile, O_WRONLY|O_CREAT|O_TRUNC); |
212 | if (fd<0) return -1; | 212 | if (fd<0) return -1; |
213 | snprintf(meow,499,"Saving savedata to %s",sramfile); | 213 | snprintf(meow,499,"Saving savedata to %s",sramfile); |
214 | rb->splash(HZ*2, true, meow); | 214 | rb->splash(HZ*2, meow); |
215 | write(fd,ram.sbank, 8192*mbc.ramsize); | 215 | write(fd,ram.sbank, 8192*mbc.ramsize); |
216 | close(fd); | 216 | close(fd); |
217 | 217 | ||
@@ -301,7 +301,7 @@ void loader_init(char *s) | |||
301 | romfile = s; | 301 | romfile = s; |
302 | if(rom_load()) | 302 | if(rom_load()) |
303 | return; | 303 | return; |
304 | rb->splash(HZ/2, true, rom.name); | 304 | rb->splash(HZ/2, rom.name); |
305 | 305 | ||
306 | snprintf(saveprefix, 499, "%s/%s", savedir, rom.name); | 306 | snprintf(saveprefix, 499, "%s/%s", savedir, rom.name); |
307 | 307 | ||
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c index b49e480f41..abacd2c831 100644 --- a/apps/plugins/rockboy/menu.c +++ b/apps/plugins/rockboy/menu.c | |||
@@ -201,7 +201,7 @@ static bool do_file(char *path, char *desc, bool is_load) { | |||
201 | 201 | ||
202 | /* print out a status message so the user knows the state loaded */ | 202 | /* print out a status message so the user knows the state loaded */ |
203 | snprintf(buf, 200, "Loaded state from \"%s\"", path); | 203 | snprintf(buf, 200, "Loaded state from \"%s\"", path); |
204 | rb->splash(HZ * 1, true, buf); | 204 | rb->splash(HZ * 1, buf); |
205 | } | 205 | } |
206 | else | 206 | else |
207 | { | 207 | { |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 01e4de51c5..9b514a4978 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -194,7 +194,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
194 | 194 | ||
195 | if (!parameter) | 195 | if (!parameter) |
196 | { | 196 | { |
197 | rb->splash(HZ*3, true, "Play gameboy ROM file! (.gb/.gbc)"); | 197 | rb->splash(HZ*3, "Play gameboy ROM file! (.gb/.gbc)"); |
198 | return PLUGIN_OK; | 198 | return PLUGIN_OK; |
199 | } | 199 | } |
200 | 200 | ||
@@ -223,11 +223,11 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
223 | 223 | ||
224 | if(shut&&!cleanshut) | 224 | if(shut&&!cleanshut) |
225 | { | 225 | { |
226 | rb->splash(HZ/2, true, errormsg); | 226 | rb->splash(HZ/2, errormsg); |
227 | return PLUGIN_ERROR; | 227 | return PLUGIN_ERROR; |
228 | } | 228 | } |
229 | pcm_close(); | 229 | pcm_close(); |
230 | rb->splash(HZ/2, true, "Shutting down"); | 230 | rb->splash(HZ/2, "Shutting down"); |
231 | 231 | ||
232 | savesettings(); | 232 | savesettings(); |
233 | 233 | ||
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 27df31092a..2881c64309 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -2475,12 +2475,12 @@ static void goto_menu(void) | |||
2475 | { | 2475 | { |
2476 | if( load_bitmap( filename ) <= 0 ) | 2476 | if( load_bitmap( filename ) <= 0 ) |
2477 | { | 2477 | { |
2478 | rb->splash( 1*HZ, true, "Error while loading %s", | 2478 | rb->splash( 1*HZ, "Error while loading %s", |
2479 | filename ); | 2479 | filename ); |
2480 | } | 2480 | } |
2481 | else | 2481 | else |
2482 | { | 2482 | { |
2483 | rb->splash( 1*HZ, true, "Image loaded (%s)", filename ); | 2483 | rb->splash( 1*HZ, "Image loaded (%s)", filename ); |
2484 | restore_screen(); | 2484 | restore_screen(); |
2485 | inv_cursor(true); | 2485 | inv_cursor(true); |
2486 | return; | 2486 | return; |
@@ -2492,7 +2492,7 @@ static void goto_menu(void) | |||
2492 | if( !rb->kbd_input( filename, MAX_PATH ) ) | 2492 | if( !rb->kbd_input( filename, MAX_PATH ) ) |
2493 | { | 2493 | { |
2494 | save_bitmap( filename ); | 2494 | save_bitmap( filename ); |
2495 | rb->splash( 1*HZ, true, "File saved (%s)", filename ); | 2495 | rb->splash( 1*HZ, "File saved (%s)", filename ); |
2496 | } | 2496 | } |
2497 | break; | 2497 | break; |
2498 | 2498 | ||
@@ -2943,7 +2943,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
2943 | rb->lcd_set_foreground(COLOR_WHITE); | 2943 | rb->lcd_set_foreground(COLOR_WHITE); |
2944 | rb->lcd_set_backdrop(NULL); | 2944 | rb->lcd_set_backdrop(NULL); |
2945 | rb->lcd_fillrect(0,0,LCD_WIDTH,LCD_HEIGHT); | 2945 | rb->lcd_fillrect(0,0,LCD_WIDTH,LCD_HEIGHT); |
2946 | rb->splash( HZ/2, true, "Rock Paint"); | 2946 | rb->splash( HZ/2, "Rock Paint"); |
2947 | 2947 | ||
2948 | rb->lcd_clear_display(); | 2948 | rb->lcd_clear_display(); |
2949 | 2949 | ||
@@ -2953,12 +2953,12 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
2953 | { | 2953 | { |
2954 | if( load_bitmap( parameter ) <= 0 ) | 2954 | if( load_bitmap( parameter ) <= 0 ) |
2955 | { | 2955 | { |
2956 | rb->splash( 1*HZ, true, "Error"); | 2956 | rb->splash( 1*HZ, "Error"); |
2957 | clear_drawing(); | 2957 | clear_drawing(); |
2958 | } | 2958 | } |
2959 | else | 2959 | else |
2960 | { | 2960 | { |
2961 | rb->splash( 1*HZ, true, "Image loaded (%s)", parameter ); | 2961 | rb->splash( 1*HZ, "Image loaded (%s)", parameter ); |
2962 | restore_screen(); | 2962 | restore_screen(); |
2963 | rb->strcpy( filename, parameter ); | 2963 | rb->strcpy( filename, parameter ); |
2964 | } | 2964 | } |
diff --git a/apps/plugins/search.c b/apps/plugins/search.c index 5a30ce6064..6d4cfd2d78 100644 --- a/apps/plugins/search.c +++ b/apps/plugins/search.c | |||
@@ -121,7 +121,7 @@ static bool search_init(char* file) | |||
121 | if (!rb->kbd_input(search_string,sizeof search_string)) | 121 | if (!rb->kbd_input(search_string,sizeof search_string)) |
122 | { | 122 | { |
123 | rb->lcd_clear_display(); | 123 | rb->lcd_clear_display(); |
124 | rb->splash(0, true, "Searching..."); | 124 | rb->splash(0, "Searching..."); |
125 | fd = rb->open(file, O_RDONLY); | 125 | fd = rb->open(file, O_RDONLY); |
126 | if (fd==-1) | 126 | if (fd==-1) |
127 | return false; | 127 | return false; |
@@ -130,9 +130,9 @@ static bool search_init(char* file) | |||
130 | 130 | ||
131 | if (fdw < 0) { | 131 | if (fdw < 0) { |
132 | #ifdef HAVE_LCD_BITMAP | 132 | #ifdef HAVE_LCD_BITMAP |
133 | rb->splash(HZ, true, "Failed to create result file!"); | 133 | rb->splash(HZ, "Failed to create result file!"); |
134 | #else | 134 | #else |
135 | rb->splash(HZ, true, "File creation failed"); | 135 | rb->splash(HZ, "File creation failed"); |
136 | #endif | 136 | #endif |
137 | return false; | 137 | return false; |
138 | } | 138 | } |
@@ -158,7 +158,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
158 | /* Check the extension. We only allow .m3u files. */ | 158 | /* Check the extension. We only allow .m3u files. */ |
159 | if(rb->strcasecmp(&filename[rb->strlen(filename)-4], ".m3u") && | 159 | if(rb->strcasecmp(&filename[rb->strlen(filename)-4], ".m3u") && |
160 | rb->strcasecmp(&filename[rb->strlen(filename)-5], ".m3u8")) { | 160 | rb->strcasecmp(&filename[rb->strlen(filename)-5], ".m3u8")) { |
161 | rb->splash(HZ, true, "Not a .m3u or .m3u8 file"); | 161 | rb->splash(HZ, "Not a .m3u or .m3u8 file"); |
162 | return PLUGIN_ERROR; | 162 | return PLUGIN_ERROR; |
163 | } | 163 | } |
164 | 164 | ||
@@ -176,7 +176,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
176 | search_buffer(); | 176 | search_buffer(); |
177 | 177 | ||
178 | rb->lcd_clear_display(); | 178 | rb->lcd_clear_display(); |
179 | rb->splash(HZ, true, "Done"); | 179 | rb->splash(HZ, "Done"); |
180 | rb->close(fdw); | 180 | rb->close(fdw); |
181 | rb->close(fd); | 181 | rb->close(fd); |
182 | 182 | ||
diff --git a/apps/plugins/searchengine/parser.c b/apps/plugins/searchengine/parser.c index 76beab49cc..9eabdb6bbe 100644 --- a/apps/plugins/searchengine/parser.c +++ b/apps/plugins/searchengine/parser.c | |||
@@ -47,7 +47,7 @@ unsigned char *parse(int fd) { | |||
47 | ret=parseMExpr(); | 47 | ret=parseMExpr(); |
48 | if(syntaxerror) { | 48 | if(syntaxerror) { |
49 | PUTS("Syntaxerror"); | 49 | PUTS("Syntaxerror"); |
50 | rb->splash(HZ*3,true,errormsg); | 50 | rb->splash(HZ*3,errormsg); |
51 | } | 51 | } |
52 | parser_accept(TOKEN_EOF); | 52 | parser_accept(TOKEN_EOF); |
53 | return ret; | 53 | return ret; |
@@ -267,7 +267,7 @@ unsigned char *parseMExpr() { | |||
267 | if(filter[currentlevel][i]) // this should always be true | 267 | if(filter[currentlevel][i]) // this should always be true |
268 | ret[i]=ret[i] || ret2[i]; | 268 | ret[i]=ret[i] || ret2[i]; |
269 | else | 269 | else |
270 | rb->splash(HZ*2,true,"An or is having a filter, bad."); | 270 | rb->splash(HZ*2,"An or is having a filter, bad."); |
271 | } | 271 | } |
272 | return ret; | 272 | return ret; |
273 | } | 273 | } |
diff --git a/apps/plugins/searchengine/searchengine.c b/apps/plugins/searchengine/searchengine.c index 6c2322e950..2687bd9289 100644 --- a/apps/plugins/searchengine/searchengine.c +++ b/apps/plugins/searchengine/searchengine.c | |||
@@ -71,7 +71,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
71 | PUTS("SearchEngine v0.1"); | 71 | PUTS("SearchEngine v0.1"); |
72 | parsefd=rb->open(parameter,O_RDONLY); | 72 | parsefd=rb->open(parameter,O_RDONLY); |
73 | if(parsefd<0) { | 73 | if(parsefd<0) { |
74 | rb->splash(2*HZ,true,"Unable to open search tokenstream"); | 74 | rb->splash(2*HZ,"Unable to open search tokenstream"); |
75 | return PLUGIN_ERROR; | 75 | return PLUGIN_ERROR; |
76 | } | 76 | } |
77 | result=parse(parsefd); | 77 | result=parse(parsefd); |
@@ -90,7 +90,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
90 | rb->close(fd); | 90 | rb->close(fd); |
91 | } | 91 | } |
92 | rb->snprintf(buf,250,"Hits: %d",hits); | 92 | rb->snprintf(buf,250,"Hits: %d",hits); |
93 | rb->splash(HZ*3,true,buf); | 93 | rb->splash(HZ*3,buf); |
94 | if (result!=0) { | 94 | if (result!=0) { |
95 | /* Return PLUGIN_USB_CONNECTED to force a file-tree refresh */ | 95 | /* Return PLUGIN_USB_CONNECTED to force a file-tree refresh */ |
96 | return PLUGIN_USB_CONNECTED; | 96 | return PLUGIN_USB_CONNECTED; |
diff --git a/apps/plugins/searchengine/token.c b/apps/plugins/searchengine/token.c index d51d92a712..3c01d4633e 100644 --- a/apps/plugins/searchengine/token.c +++ b/apps/plugins/searchengine/token.c | |||
@@ -43,14 +43,14 @@ char *getstring(struct token *token) { | |||
43 | return currententry->filename; | 43 | return currententry->filename; |
44 | default: | 44 | default: |
45 | rb->snprintf(buf,199,"unknown stringid intvalue %d",token->intvalue); | 45 | rb->snprintf(buf,199,"unknown stringid intvalue %d",token->intvalue); |
46 | rb->splash(HZ*2,true,buf); | 46 | rb->splash(HZ*2,buf); |
47 | return ""; | 47 | return ""; |
48 | } | 48 | } |
49 | break; | 49 | break; |
50 | default: | 50 | default: |
51 | // report error | 51 | // report error |
52 | rb->snprintf(buf,199,"unknown token %d in getstring..",token->kind); | 52 | rb->snprintf(buf,199,"unknown token %d in getstring..",token->kind); |
53 | rb->splash(HZ*2,true,buf); | 53 | rb->splash(HZ*2,buf); |
54 | return ""; | 54 | return ""; |
55 | } | 55 | } |
56 | } | 56 | } |
@@ -104,13 +104,13 @@ int getvalue(struct token *token) { | |||
104 | return (currententry->playcount-dbglobal.playcountmin)*10/(dbglobal.playcountmax-dbglobal.playcountmin); | 104 | return (currententry->playcount-dbglobal.playcountmin)*10/(dbglobal.playcountmax-dbglobal.playcountmin); |
105 | default: | 105 | default: |
106 | rb->snprintf(buf,199,"unknown numid intvalue %d",token->intvalue); | 106 | rb->snprintf(buf,199,"unknown numid intvalue %d",token->intvalue); |
107 | rb->splash(HZ*2,true,buf); | 107 | rb->splash(HZ*2,buf); |
108 | // report error. | 108 | // report error. |
109 | return 0; | 109 | return 0; |
110 | } | 110 | } |
111 | default: | 111 | default: |
112 | rb->snprintf(buf,199,"unknown token %d in getvalue..",token->kind); | 112 | rb->snprintf(buf,199,"unknown token %d in getvalue..",token->kind); |
113 | rb->splash(HZ*2,true,buf); | 113 | rb->splash(HZ*2,buf); |
114 | return 0; | 114 | return 0; |
115 | } | 115 | } |
116 | } | 116 | } |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index b850dfbe11..350beb6dc1 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -351,7 +351,7 @@ int load_all_levels(void) | |||
351 | num_levels++; | 351 | num_levels++; |
352 | if(num_levels > max_levels) | 352 | if(num_levels > max_levels) |
353 | { | 353 | { |
354 | rb->splash(HZ, true, "Too many levels in file"); | 354 | rb->splash(HZ, "Too many levels in file"); |
355 | break; | 355 | break; |
356 | } | 356 | } |
357 | continue; | 357 | continue; |
@@ -834,7 +834,7 @@ void die (void) | |||
834 | bool done=false; | 834 | bool done=false; |
835 | char pscore[20]; | 835 | char pscore[20]; |
836 | 836 | ||
837 | rb->splash(HZ*2, true, "Oops!"); | 837 | rb->splash(HZ*2, "Oops!"); |
838 | 838 | ||
839 | rb->lcd_clear_display(); | 839 | rb->lcd_clear_display(); |
840 | 840 | ||
@@ -914,7 +914,7 @@ void collision ( int x, int y ) | |||
914 | num_apples_to_get+=2; | 914 | num_apples_to_get+=2; |
915 | game_b_level++; | 915 | game_b_level++; |
916 | } | 916 | } |
917 | rb->splash(HZ, true, "Level Completed!"); | 917 | rb->splash(HZ, "Level Completed!"); |
918 | rb->lcd_clear_display(); | 918 | rb->lcd_clear_display(); |
919 | new_level(level_from_file); | 919 | new_level(level_from_file); |
920 | rb->lcd_clear_display(); | 920 | rb->lcd_clear_display(); |
@@ -1357,7 +1357,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1357 | load_all_levels(); | 1357 | load_all_levels(); |
1358 | 1358 | ||
1359 | if (num_levels == 0) { | 1359 | if (num_levels == 0) { |
1360 | rb->splash(HZ*2, true, "Failed loading levels!"); | 1360 | rb->splash(HZ*2, "Failed loading levels!"); |
1361 | return PLUGIN_OK; | 1361 | return PLUGIN_OK; |
1362 | } | 1362 | } |
1363 | 1363 | ||
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 9e8f4f582f..64d3f2430b 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -181,7 +181,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
181 | #ifdef HAVE_LCD_CHARCELLS | 181 | #ifdef HAVE_LCD_CHARCELLS |
182 | if (!pgfx_init(rb, 4, 2)) | 182 | if (!pgfx_init(rb, 4, 2)) |
183 | { | 183 | { |
184 | rb->splash(HZ*2, true, "Old LCD :("); | 184 | rb->splash(HZ*2, "Old LCD :("); |
185 | return PLUGIN_OK; | 185 | return PLUGIN_OK; |
186 | } | 186 | } |
187 | #endif | 187 | #endif |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 7941e97585..6892e83f31 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -460,7 +460,7 @@ static int read_levels(int initialize_count) | |||
460 | endpoint += NUM_BUFFERED_BOARDS; | 460 | endpoint += NUM_BUFFERED_BOARDS; |
461 | 461 | ||
462 | if ((fd = rb->open(LEVELS_FILE, O_RDONLY)) < 0) { | 462 | if ((fd = rb->open(LEVELS_FILE, O_RDONLY)) < 0) { |
463 | rb->splash(HZ*2, true, "Unable to open %s", LEVELS_FILE); | 463 | rb->splash(HZ*2, "Unable to open %s", LEVELS_FILE); |
464 | return -1; | 464 | return -1; |
465 | } | 465 | } |
466 | 466 | ||
@@ -472,7 +472,7 @@ static int read_levels(int initialize_count) | |||
472 | * a mixed unix and dos CR/LF file format, I'm not going to | 472 | * a mixed unix and dos CR/LF file format, I'm not going to |
473 | * do a precise check */ | 473 | * do a precise check */ |
474 | if (len < COLS) { | 474 | if (len < COLS) { |
475 | rb->splash(HZ*2, true, "Error in levels file: short line"); | 475 | rb->splash(HZ*2, "Error in levels file: short line"); |
476 | return -1; | 476 | return -1; |
477 | } | 477 | } |
478 | if (level_count >= buffered_boards.low && level_count < endpoint) { | 478 | if (level_count >= buffered_boards.low && level_count < endpoint) { |
@@ -487,8 +487,7 @@ static int read_levels(int initialize_count) | |||
487 | level_count++; | 487 | level_count++; |
488 | if (level_count >= endpoint && !initialize_count) break; | 488 | if (level_count >= endpoint && !initialize_count) break; |
489 | if (level_count && row != ROWS) { | 489 | if (level_count && row != ROWS) { |
490 | rb->splash(HZ*2, true, | 490 | rb->splash(HZ*2, "Error in levels file: short board"); |
491 | "Error in levels file: short board"); | ||
492 | return -1; | 491 | return -1; |
493 | } | 492 | } |
494 | row = 0; | 493 | row = 0; |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 2260599bc3..da01f0f608 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -1159,7 +1159,7 @@ int solitaire( void ) | |||
1159 | /* if there aren't any, that means you won :) */ | 1159 | /* if there aren't any, that means you won :) */ |
1160 | if( biggest_col_length == 0 && rem == NOT_A_CARD ) | 1160 | if( biggest_col_length == 0 && rem == NOT_A_CARD ) |
1161 | { | 1161 | { |
1162 | rb->splash( HZ, true, "You Won :)" ); | 1162 | rb->splash( HZ, "You Won :)" ); |
1163 | return bouncing_cards(); | 1163 | return bouncing_cards(); |
1164 | } | 1164 | } |
1165 | 1165 | ||
@@ -1588,7 +1588,7 @@ enum plugin_status plugin_start( struct plugin_api* api, void* parameter ) | |||
1588 | (void)parameter; | 1588 | (void)parameter; |
1589 | rb = api; | 1589 | rb = api; |
1590 | 1590 | ||
1591 | rb->splash( HZ, true, "Welcome to Solitaire!" ); | 1591 | rb->splash( HZ, "Welcome to Solitaire!" ); |
1592 | 1592 | ||
1593 | configfile_init(rb); | 1593 | configfile_init(rb); |
1594 | configfile_load(CONFIG_FILENAME, config, | 1594 | configfile_load(CONFIG_FILENAME, config, |
diff --git a/apps/plugins/sort.c b/apps/plugins/sort.c index 80ef22fa44..79b5400db2 100644 --- a/apps/plugins/sort.c +++ b/apps/plugins/sort.c | |||
@@ -191,32 +191,32 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
191 | pointers = (char **)(buf + buf_size - sizeof(int)); | 191 | pointers = (char **)(buf + buf_size - sizeof(int)); |
192 | 192 | ||
193 | rb->lcd_clear_display(); | 193 | rb->lcd_clear_display(); |
194 | rb->splash(0, true, "Loading..."); | 194 | rb->splash(0, "Loading..."); |
195 | 195 | ||
196 | rc = read_buffer(0); | 196 | rc = read_buffer(0); |
197 | if(rc == 0) { | 197 | if(rc == 0) { |
198 | rb->lcd_clear_display(); | 198 | rb->lcd_clear_display(); |
199 | rb->splash(0, true, "Sorting..."); | 199 | rb->splash(0, "Sorting..."); |
200 | sort_buffer(); | 200 | sort_buffer(); |
201 | 201 | ||
202 | rb->lcd_clear_display(); | 202 | rb->lcd_clear_display(); |
203 | rb->splash(0, true, "Writing..."); | 203 | rb->splash(0, "Writing..."); |
204 | 204 | ||
205 | rc = write_file(); | 205 | rc = write_file(); |
206 | if(rc < 0) { | 206 | if(rc < 0) { |
207 | rb->lcd_clear_display(); | 207 | rb->lcd_clear_display(); |
208 | rb->splash(HZ, true, "Can't write file: %d", rc); | 208 | rb->splash(HZ, "Can't write file: %d", rc); |
209 | } else { | 209 | } else { |
210 | rb->lcd_clear_display(); | 210 | rb->lcd_clear_display(); |
211 | rb->splash(HZ, true, "Done"); | 211 | rb->splash(HZ, "Done"); |
212 | } | 212 | } |
213 | } else { | 213 | } else { |
214 | if(rc < 0) { | 214 | if(rc < 0) { |
215 | rb->lcd_clear_display(); | 215 | rb->lcd_clear_display(); |
216 | rb->splash(HZ, true, "Can't read file: %d", rc); | 216 | rb->splash(HZ, "Can't read file: %d", rc); |
217 | } else { | 217 | } else { |
218 | rb->lcd_clear_display(); | 218 | rb->lcd_clear_display(); |
219 | rb->splash(HZ, true, "The file is too big"); | 219 | rb->splash(HZ, "The file is too big"); |
220 | } | 220 | } |
221 | } | 221 | } |
222 | 222 | ||
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index b2c704d2d9..a44087e609 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c | |||
@@ -543,14 +543,14 @@ static void generateFileName(char* file_name, int part_no) | |||
543 | } | 543 | } |
544 | else | 544 | else |
545 | { | 545 | { |
546 | rb->splash(0, true, "wrong extension"); | 546 | rb->splash(0, "wrong extension"); |
547 | rb->button_get(true); | 547 | rb->button_get(true); |
548 | rb->button_get(true); | 548 | rb->button_get(true); |
549 | } | 549 | } |
550 | } | 550 | } |
551 | else | 551 | else |
552 | { | 552 | { |
553 | rb->splash(0, true, "name too long"); | 553 | rb->splash(0, "name too long"); |
554 | rb->button_get(true); | 554 | rb->button_get(true); |
555 | rb->button_get(true); | 555 | rb->button_get(true); |
556 | 556 | ||
@@ -585,7 +585,7 @@ static int copy_file( | |||
585 | bytes_written = rb->write(dest, buffer, bytes_read); | 585 | bytes_written = rb->write(dest, buffer, bytes_read); |
586 | 586 | ||
587 | if (bytes_written < 0) { | 587 | if (bytes_written < 0) { |
588 | rb->splash(0, true, "Write failed in copy."); | 588 | rb->splash(0, "Write failed in copy."); |
589 | rb->button_get(true); | 589 | rb->button_get(true); |
590 | rb->button_get(true); | 590 | rb->button_get(true); |
591 | return -1; | 591 | return -1; |
@@ -598,7 +598,7 @@ static int copy_file( | |||
598 | || button == SPLITEDIT_RC_QUIT: | 598 | || button == SPLITEDIT_RC_QUIT: |
599 | #endif | 599 | #endif |
600 | ) { | 600 | ) { |
601 | rb->splash(0, true, "Aborting copy."); | 601 | rb->splash(0, "Aborting copy."); |
602 | rb->button_get(true); | 602 | rb->button_get(true); |
603 | rb->button_get(true); | 603 | rb->button_get(true); |
604 | return -1; | 604 | return -1; |
@@ -632,7 +632,7 @@ static int save( | |||
632 | if (file1 >= 0) | 632 | if (file1 >= 0) |
633 | { | 633 | { |
634 | rb->close(file1); | 634 | rb->close(file1); |
635 | rb->splash(0, true, "File 1 exists. Please rename."); | 635 | rb->splash(0, "File 1 exists. Please rename."); |
636 | rb->button_get(true); | 636 | rb->button_get(true); |
637 | rb->button_get(true); | 637 | rb->button_get(true); |
638 | return -1; | 638 | return -1; |
@@ -646,7 +646,7 @@ static int save( | |||
646 | if (file2 >= 0) | 646 | if (file2 >= 0) |
647 | { | 647 | { |
648 | rb->close(file2); | 648 | rb->close(file2); |
649 | rb->splash(0, true, "File 2 exists. Please rename."); | 649 | rb->splash(0, "File 2 exists. Please rename."); |
650 | rb->button_get(true); | 650 | rb->button_get(true); |
651 | rb->button_get(true); | 651 | rb->button_get(true); |
652 | return -2; | 652 | return -2; |
@@ -688,8 +688,7 @@ static int save( | |||
688 | 688 | ||
689 | if (close_stat != 0) | 689 | if (close_stat != 0) |
690 | { | 690 | { |
691 | rb->splash(0, true, | 691 | rb->splash(0, "failed closing file1: error %d", close_stat); |
692 | "failed closing file1: error %d", close_stat); | ||
693 | rb->button_get(true); | 692 | rb->button_get(true); |
694 | rb->button_get(true); | 693 | rb->button_get(true); |
695 | } else { | 694 | } else { |
@@ -701,8 +700,7 @@ static int save( | |||
701 | } | 700 | } |
702 | else | 701 | else |
703 | { | 702 | { |
704 | rb->splash(0, true, | 703 | rb->splash(0, "Can't write File1: error %d", file1); |
705 | "Can't write File1: error %d", file1); | ||
706 | rb->button_get(true); | 704 | rb->button_get(true); |
707 | rb->button_get(true); | 705 | rb->button_get(true); |
708 | retval = -1; | 706 | retval = -1; |
@@ -713,8 +711,7 @@ static int save( | |||
713 | { | 711 | { |
714 | if (rb->lseek(src_file, end, SEEK_SET) < (off_t)end) | 712 | if (rb->lseek(src_file, end, SEEK_SET) < (off_t)end) |
715 | { | 713 | { |
716 | rb->splash(0, true, | 714 | rb->splash(0, "Src file to short: error %d", src_file); |
717 | "Src file to short: error %d", src_file); | ||
718 | rb->button_get(true); | 715 | rb->button_get(true); |
719 | rb->button_get(true); | 716 | rb->button_get(true); |
720 | } | 717 | } |
@@ -732,8 +729,8 @@ static int save( | |||
732 | 729 | ||
733 | if (close_stat != 0) | 730 | if (close_stat != 0) |
734 | { | 731 | { |
735 | rb->splash(0, true, | 732 | rb->splash(0, "failed: closing file2: error %d", |
736 | "failed: closing file2: error %d", close_stat); | 733 | close_stat); |
737 | rb->button_get(true); | 734 | rb->button_get(true); |
738 | rb->button_get(true); | 735 | rb->button_get(true); |
739 | } else { | 736 | } else { |
@@ -745,8 +742,7 @@ static int save( | |||
745 | } | 742 | } |
746 | else | 743 | else |
747 | { | 744 | { |
748 | rb->splash(0, true, | 745 | rb->splash(0, "Can't write File2: error %d", file2); |
749 | "Can't write File2: error %d", file2); | ||
750 | rb->button_get(true); | 746 | rb->button_get(true); |
751 | rb->button_get(true); | 747 | rb->button_get(true); |
752 | retval = -2; | 748 | retval = -2; |
@@ -756,15 +752,14 @@ static int save( | |||
756 | close_stat = rb->close(src_file); | 752 | close_stat = rb->close(src_file); |
757 | if (close_stat != 0) | 753 | if (close_stat != 0) |
758 | { | 754 | { |
759 | rb->splash(0, true, | 755 | rb->splash(0, "failed: closing src: error %d", close_stat); |
760 | "failed: closing src: error %d", close_stat); | ||
761 | rb->button_get(true); | 756 | rb->button_get(true); |
762 | rb->button_get(true); | 757 | rb->button_get(true); |
763 | } | 758 | } |
764 | } | 759 | } |
765 | else | 760 | else |
766 | { | 761 | { |
767 | rb->splash(0, true, "Source file not found"); | 762 | rb->splash(0, "Source file not found"); |
768 | rb->button_get(true); | 763 | rb->button_get(true); |
769 | rb->button_get(true); | 764 | rb->button_get(true); |
770 | retval = -3; | 765 | retval = -3; |
@@ -1051,7 +1046,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
1051 | /* MMC is slow - wait some time to allow track reload to finish */ | 1046 | /* MMC is slow - wait some time to allow track reload to finish */ |
1052 | rb->sleep(HZ/20); | 1047 | rb->sleep(HZ/20); |
1053 | if (mp3->elapsed > play_end) /* reload in progress */ | 1048 | if (mp3->elapsed > play_end) /* reload in progress */ |
1054 | rb->splash(10*HZ, true, "Wait - reloading"); | 1049 | rb->splash(10*HZ, "Wait - reloading"); |
1055 | #endif | 1050 | #endif |
1056 | rb->audio_resume(); | 1051 | rb->audio_resume(); |
1057 | break; | 1052 | break; |
@@ -1063,7 +1058,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
1063 | /* MMC is slow - wait some time to allow track reload to finish */ | 1058 | /* MMC is slow - wait some time to allow track reload to finish */ |
1064 | rb->sleep(HZ/20); | 1059 | rb->sleep(HZ/20); |
1065 | if (mp3->elapsed > play_end) /* reload in progress */ | 1060 | if (mp3->elapsed > play_end) /* reload in progress */ |
1066 | rb->splash(10*HZ, true, "Wait - reloading"); | 1061 | rb->splash(10*HZ, "Wait - reloading"); |
1067 | #endif | 1062 | #endif |
1068 | rb->audio_resume(); | 1063 | rb->audio_resume(); |
1069 | break; | 1064 | break; |
@@ -1228,7 +1223,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split, | |||
1228 | if (rb->strncasecmp(path_mp3, new_mp3->path, | 1223 | if (rb->strncasecmp(path_mp3, new_mp3->path, |
1229 | sizeof (path_mp3))) | 1224 | sizeof (path_mp3))) |
1230 | { | 1225 | { |
1231 | rb->splash(0, true,"Abort due to file change"); | 1226 | rb->splash(0, "Abort due to file change"); |
1232 | rb->button_get(true); | 1227 | rb->button_get(true); |
1233 | rb->button_get(true); | 1228 | rb->button_get(true); |
1234 | exit_request = true; | 1229 | exit_request = true; |
@@ -1272,7 +1267,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1272 | } | 1267 | } |
1273 | else | 1268 | else |
1274 | { | 1269 | { |
1275 | rb->splash(0, true, "Play or pause a mp3 file first."); | 1270 | rb->splash(0, "Play or pause a mp3 file first."); |
1276 | rb->button_get(true); | 1271 | rb->button_get(true); |
1277 | rb->button_get(true); | 1272 | rb->button_get(true); |
1278 | } | 1273 | } |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index b6a824e208..b69ab2d8e0 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -180,13 +180,13 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
180 | #ifdef HAVE_LCD_BITMAP | 180 | #ifdef HAVE_LCD_BITMAP |
181 | rb->lcd_getstringsize("Files: ", &fontwidth, &fontheight); | 181 | rb->lcd_getstringsize("Files: ", &fontwidth, &fontheight); |
182 | #endif | 182 | #endif |
183 | rb->splash(HZ, true, "Counting..."); | 183 | rb->splash(HZ, "Counting..."); |
184 | update_screen(); | 184 | update_screen(); |
185 | lasttick = *rb->current_tick; | 185 | lasttick = *rb->current_tick; |
186 | 186 | ||
187 | traversedir("", ""); | 187 | traversedir("", ""); |
188 | if (abort == true) { | 188 | if (abort == true) { |
189 | rb->splash(HZ, true, "Aborted"); | 189 | rb->splash(HZ, "Aborted"); |
190 | return PLUGIN_OK; | 190 | return PLUGIN_OK; |
191 | } | 191 | } |
192 | update_screen(); | 192 | update_screen(); |
@@ -194,7 +194,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
194 | rb->remote_backlight_on(); | 194 | rb->remote_backlight_on(); |
195 | #endif | 195 | #endif |
196 | rb->backlight_on(); | 196 | rb->backlight_on(); |
197 | rb->splash(HZ, true, "Done"); | 197 | rb->splash(HZ, "Done"); |
198 | update_screen(); | 198 | update_screen(); |
199 | button = rb->button_get(true); | 199 | button = rb->button_get(true); |
200 | while (1) { | 200 | while (1) { |
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c index 218a544f8c..59adb77fa9 100644 --- a/apps/plugins/sudoku/sudoku.c +++ b/apps/plugins/sudoku/sudoku.c | |||
@@ -490,7 +490,7 @@ void sudoku_solve(struct sudoku_state_t* state) | |||
490 | } | 490 | } |
491 | } | 491 | } |
492 | } else { | 492 | } else { |
493 | rb->splash(HZ*2, true, "Solve failed"); | 493 | rb->splash(HZ*2, "Solve failed"); |
494 | } | 494 | } |
495 | 495 | ||
496 | return; | 496 | return; |
@@ -696,7 +696,7 @@ bool save_sudoku(struct sudoku_state_t* state) | |||
696 | char line[13]; | 696 | char line[13]; |
697 | char sep[13]; | 697 | char sep[13]; |
698 | 698 | ||
699 | rb->splash(0, true, "Saving..."); | 699 | rb->splash(0, "Saving..."); |
700 | rb->memcpy(line,"...|...|...\r\n",13); | 700 | rb->memcpy(line,"...|...|...\r\n",13); |
701 | rb->memcpy(sep,"-----------\r\n",13); | 701 | rb->memcpy(sep,"-----------\r\n",13); |
702 | 702 | ||
@@ -966,7 +966,7 @@ bool sudoku_generate(struct sudoku_state_t* state) | |||
966 | 966 | ||
967 | clear_state(&new_state); | 967 | clear_state(&new_state); |
968 | display_board(&new_state); | 968 | display_board(&new_state); |
969 | rb->splash(0, true, "Generating..."); | 969 | rb->splash(0, "Generating..."); |
970 | 970 | ||
971 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | 971 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ |
972 | rb->cpu_boost(true); | 972 | rb->cpu_boost(true); |
@@ -982,11 +982,11 @@ bool sudoku_generate(struct sudoku_state_t* state) | |||
982 | rb->memcpy(state,&new_state,sizeof(new_state)); | 982 | rb->memcpy(state,&new_state,sizeof(new_state)); |
983 | rb->snprintf(str,sizeof(str),"Difficulty: %s",difficulty); | 983 | rb->snprintf(str,sizeof(str),"Difficulty: %s",difficulty); |
984 | display_board(state); | 984 | display_board(state); |
985 | rb->splash(HZ*3, true, str); | 985 | rb->splash(HZ*3, str); |
986 | rb->strncpy(state->filename,GAME_FILE,MAX_PATH); | 986 | rb->strncpy(state->filename,GAME_FILE,MAX_PATH); |
987 | } else { | 987 | } else { |
988 | display_board(&new_state); | 988 | display_board(&new_state); |
989 | rb->splash(HZ*2, true, "Aborted"); | 989 | rb->splash(HZ*2, "Aborted"); |
990 | } | 990 | } |
991 | return res; | 991 | return res; |
992 | } | 992 | } |
@@ -1079,7 +1079,7 @@ int sudoku_edit_menu(struct sudoku_state_t* state) | |||
1079 | if (save_sudoku(state)) { | 1079 | if (save_sudoku(state)) { |
1080 | state->editmode=0; | 1080 | state->editmode=0; |
1081 | } else { | 1081 | } else { |
1082 | rb->splash(HZ*2, true, "Save failed"); | 1082 | rb->splash(HZ*2, "Save failed"); |
1083 | } | 1083 | } |
1084 | break; | 1084 | break; |
1085 | 1085 | ||
@@ -1101,7 +1101,7 @@ void move_cursor(struct sudoku_state_t* state, int newx, int newy) | |||
1101 | 1101 | ||
1102 | /* Check that the character at the cursor position is legal */ | 1102 | /* Check that the character at the cursor position is legal */ |
1103 | if (check_status(state)) { | 1103 | if (check_status(state)) { |
1104 | rb->splash(HZ*2, true, "Illegal move!"); | 1104 | rb->splash(HZ*2, "Illegal move!"); |
1105 | /* Ignore any button presses during the splash */ | 1105 | /* Ignore any button presses during the splash */ |
1106 | rb->button_clear_queue(); | 1106 | rb->button_clear_queue(); |
1107 | return; | 1107 | return; |
@@ -1148,7 +1148,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1148 | } | 1148 | } |
1149 | } else { | 1149 | } else { |
1150 | if (!load_sudoku(&state,(char*)parameter)) { | 1150 | if (!load_sudoku(&state,(char*)parameter)) { |
1151 | rb->splash(HZ*2, true, "Load error"); | 1151 | rb->splash(HZ*2, "Load error"); |
1152 | return(PLUGIN_ERROR); | 1152 | return(PLUGIN_ERROR); |
1153 | } | 1153 | } |
1154 | } | 1154 | } |
@@ -1167,7 +1167,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1167 | /* Exit game */ | 1167 | /* Exit game */ |
1168 | case SUDOKU_BUTTON_QUIT: | 1168 | case SUDOKU_BUTTON_QUIT: |
1169 | if (check_status(&state)) { | 1169 | if (check_status(&state)) { |
1170 | rb->splash(HZ*2, true, "Illegal move!"); | 1170 | rb->splash(HZ*2, "Illegal move!"); |
1171 | /* Ignore any button presses during the splash */ | 1171 | /* Ignore any button presses during the splash */ |
1172 | rb->button_clear_queue(); | 1172 | rb->button_clear_queue(); |
1173 | } else { | 1173 | } else { |
@@ -1316,7 +1316,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1316 | #endif | 1316 | #endif |
1317 | /* Don't let the user leave a game in a bad state */ | 1317 | /* Don't let the user leave a game in a bad state */ |
1318 | if (check_status(&state)) { | 1318 | if (check_status(&state)) { |
1319 | rb->splash(HZ*2, true, "Illegal move!"); | 1319 | rb->splash(HZ*2, "Illegal move!"); |
1320 | /* Ignore any button presses during the splash */ | 1320 | /* Ignore any button presses during the splash */ |
1321 | rb->button_clear_queue(); | 1321 | rb->button_clear_queue(); |
1322 | } else { | 1322 | } else { |
diff --git a/apps/plugins/test_disk.c b/apps/plugins/test_disk.c index edc1dfbddb..91fc3bb405 100644 --- a/apps/plugins/test_disk.c +++ b/apps/plugins/test_disk.c | |||
@@ -105,7 +105,7 @@ static bool test_fs(void) | |||
105 | fd = rb->creat(TEST_FILE); | 105 | fd = rb->creat(TEST_FILE); |
106 | if (fd < 0) | 106 | if (fd < 0) |
107 | { | 107 | { |
108 | rb->splash(0, true, "Couldn't create testfile."); | 108 | rb->splash(0, "Couldn't create testfile."); |
109 | goto error; | 109 | goto error; |
110 | } | 110 | } |
111 | 111 | ||
@@ -123,7 +123,7 @@ static bool test_fs(void) | |||
123 | mem_fill_frnd(buf_start + align, current); | 123 | mem_fill_frnd(buf_start + align, current); |
124 | if (current != rb->write(fd, buf_start + align, current)) | 124 | if (current != rb->write(fd, buf_start + align, current)) |
125 | { | 125 | { |
126 | rb->splash(0, true, "Write error."); | 126 | rb->splash(0, "Write error."); |
127 | rb->close(fd); | 127 | rb->close(fd); |
128 | goto error; | 128 | goto error; |
129 | } | 129 | } |
@@ -134,7 +134,7 @@ static bool test_fs(void) | |||
134 | fd = rb->open(TEST_FILE, O_RDONLY); | 134 | fd = rb->open(TEST_FILE, O_RDONLY); |
135 | if (fd < 0) | 135 | if (fd < 0) |
136 | { | 136 | { |
137 | rb->splash(0, true, "Couldn't open testfile."); | 137 | rb->splash(0, "Couldn't open testfile."); |
138 | goto error; | 138 | goto error; |
139 | } | 139 | } |
140 | 140 | ||
@@ -151,7 +151,7 @@ static bool test_fs(void) | |||
151 | 151 | ||
152 | if (current != rb->read(fd, buf_start + align, current)) | 152 | if (current != rb->read(fd, buf_start + align, current)) |
153 | { | 153 | { |
154 | rb->splash(0, true, "Read error."); | 154 | rb->splash(0, "Read error."); |
155 | rb->close(fd); | 155 | rb->close(fd); |
156 | goto error; | 156 | goto error; |
157 | } | 157 | } |
@@ -196,13 +196,13 @@ static bool test_speed(void) | |||
196 | fd = rb->creat(TEST_FILE); | 196 | fd = rb->creat(TEST_FILE); |
197 | if (fd < 0) | 197 | if (fd < 0) |
198 | { | 198 | { |
199 | rb->splash(0, true, "Couldn't create testfile."); | 199 | rb->splash(0, "Couldn't create testfile."); |
200 | goto error; | 200 | goto error; |
201 | } | 201 | } |
202 | time = *rb->current_tick; | 202 | time = *rb->current_tick; |
203 | if (buf_len != rb->write(fd, buf_start, buf_len)) | 203 | if (buf_len != rb->write(fd, buf_start, buf_len)) |
204 | { | 204 | { |
205 | rb->splash(0, true, "Write error."); | 205 | rb->splash(0, "Write error."); |
206 | rb->close(fd); | 206 | rb->close(fd); |
207 | goto error; | 207 | goto error; |
208 | } | 208 | } |
@@ -215,13 +215,13 @@ static bool test_speed(void) | |||
215 | fd = rb->open(TEST_FILE, O_WRONLY); | 215 | fd = rb->open(TEST_FILE, O_WRONLY); |
216 | if (fd < 0) | 216 | if (fd < 0) |
217 | { | 217 | { |
218 | rb->splash(0, true, "Couldn't open testfile."); | 218 | rb->splash(0, "Couldn't open testfile."); |
219 | goto error; | 219 | goto error; |
220 | } | 220 | } |
221 | time = *rb->current_tick; | 221 | time = *rb->current_tick; |
222 | if (buf_len != rb->write(fd, buf_start, buf_len)) | 222 | if (buf_len != rb->write(fd, buf_start, buf_len)) |
223 | { | 223 | { |
224 | rb->splash(0, true, "Write error."); | 224 | rb->splash(0, "Write error."); |
225 | rb->close(fd); | 225 | rb->close(fd); |
226 | goto error; | 226 | goto error; |
227 | } | 227 | } |
@@ -234,13 +234,13 @@ static bool test_speed(void) | |||
234 | fd = rb->open(TEST_FILE, O_WRONLY); | 234 | fd = rb->open(TEST_FILE, O_WRONLY); |
235 | if (fd < 0) | 235 | if (fd < 0) |
236 | { | 236 | { |
237 | rb->splash(0, true, "Couldn't open testfile."); | 237 | rb->splash(0, "Couldn't open testfile."); |
238 | goto error; | 238 | goto error; |
239 | } | 239 | } |
240 | time = *rb->current_tick; | 240 | time = *rb->current_tick; |
241 | if (buf_len != rb->write(fd, buf_start + 1, buf_len)) | 241 | if (buf_len != rb->write(fd, buf_start + 1, buf_len)) |
242 | { | 242 | { |
243 | rb->splash(0, true, "Write error."); | 243 | rb->splash(0, "Write error."); |
244 | rb->close(fd); | 244 | rb->close(fd); |
245 | goto error; | 245 | goto error; |
246 | } | 246 | } |
@@ -253,13 +253,13 @@ static bool test_speed(void) | |||
253 | fd = rb->open(TEST_FILE, O_RDONLY); | 253 | fd = rb->open(TEST_FILE, O_RDONLY); |
254 | if (fd < 0) | 254 | if (fd < 0) |
255 | { | 255 | { |
256 | rb->splash(0, true, "Couldn't open testfile."); | 256 | rb->splash(0, "Couldn't open testfile."); |
257 | goto error; | 257 | goto error; |
258 | } | 258 | } |
259 | time = *rb->current_tick; | 259 | time = *rb->current_tick; |
260 | if (buf_len != rb->read(fd, buf_start, buf_len)) | 260 | if (buf_len != rb->read(fd, buf_start, buf_len)) |
261 | { | 261 | { |
262 | rb->splash(0, true, "Read error."); | 262 | rb->splash(0, "Read error."); |
263 | rb->close(fd); | 263 | rb->close(fd); |
264 | goto error; | 264 | goto error; |
265 | } | 265 | } |
@@ -272,13 +272,13 @@ static bool test_speed(void) | |||
272 | fd = rb->open(TEST_FILE, O_RDONLY); | 272 | fd = rb->open(TEST_FILE, O_RDONLY); |
273 | if (fd < 0) | 273 | if (fd < 0) |
274 | { | 274 | { |
275 | rb->splash(0, true, "Couldn't open testfile."); | 275 | rb->splash(0, "Couldn't open testfile."); |
276 | goto error; | 276 | goto error; |
277 | } | 277 | } |
278 | time = *rb->current_tick; | 278 | time = *rb->current_tick; |
279 | if (buf_len != rb->read(fd, buf_start + 1, buf_len)) | 279 | if (buf_len != rb->read(fd, buf_start + 1, buf_len)) |
280 | { | 280 | { |
281 | rb->splash(0, true, "Read error."); | 281 | rb->splash(0, "Read error."); |
282 | rb->close(fd); | 282 | rb->close(fd); |
283 | goto error; | 283 | goto error; |
284 | } | 284 | } |
diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c index bf69acff93..8040d00f22 100644 --- a/apps/plugins/text_editor.c +++ b/apps/plugins/text_editor.c | |||
@@ -178,7 +178,7 @@ void save_changes(int overwrite) | |||
178 | fd = rb->open(filename,O_WRONLY|O_CREAT|O_TRUNC); | 178 | fd = rb->open(filename,O_WRONLY|O_CREAT|O_TRUNC); |
179 | if (fd < 0) | 179 | if (fd < 0) |
180 | { | 180 | { |
181 | rb->splash(HZ*2,1,"Changes NOT saved"); | 181 | rb->splash(HZ*2, "Changes NOT saved"); |
182 | return; | 182 | return; |
183 | } | 183 | } |
184 | 184 | ||
@@ -315,7 +315,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
315 | fd = rb->open(filename,O_RDONLY); | 315 | fd = rb->open(filename,O_RDONLY); |
316 | if (fd<0) | 316 | if (fd<0) |
317 | { | 317 | { |
318 | rb->splash(HZ*2,true,"Couldnt open file: %s",(char*)parameter); | 318 | rb->splash(HZ*2,"Couldnt open file: %s",(char*)parameter); |
319 | return PLUGIN_ERROR; | 319 | return PLUGIN_ERROR; |
320 | } | 320 | } |
321 | /* read in the file */ | 321 | /* read in the file */ |
@@ -323,7 +323,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
323 | { | 323 | { |
324 | if (!do_action(ACTION_INSERT,temp_line,line_count)) | 324 | if (!do_action(ACTION_INSERT,temp_line,line_count)) |
325 | { | 325 | { |
326 | rb->splash(HZ*2,true,"Error reading file: %s",(char*)parameter); | 326 | rb->splash(HZ*2,"Error reading file: %s",(char*)parameter); |
327 | rb->close(fd); | 327 | rb->close(fd); |
328 | return PLUGIN_ERROR; | 328 | return PLUGIN_ERROR; |
329 | } | 329 | } |
diff --git a/apps/plugins/vbrfix.c b/apps/plugins/vbrfix.c index 9bdaf493f9..c87005f7a3 100644 --- a/apps/plugins/vbrfix.c +++ b/apps/plugins/vbrfix.c | |||
@@ -118,7 +118,7 @@ static int insert_data_in_file(char *fname, int fpos, char *buf, int num_bytes) | |||
118 | 118 | ||
119 | static void fileerror(int rc) | 119 | static void fileerror(int rc) |
120 | { | 120 | { |
121 | rb->splash(HZ*2, true, "File error: %d", rc); | 121 | rb->splash(HZ*2, "File error: %d", rc); |
122 | } | 122 | } |
123 | 123 | ||
124 | static const unsigned char empty_id3_header[] = | 124 | static const unsigned char empty_id3_header[] = |
@@ -259,7 +259,7 @@ static bool vbr_fix(char *selected_file) | |||
259 | { | 259 | { |
260 | /* Not a VBR file */ | 260 | /* Not a VBR file */ |
261 | DEBUGF("Not a VBR file\n"); | 261 | DEBUGF("Not a VBR file\n"); |
262 | rb->splash(HZ*2, true, "Not a VBR file"); | 262 | rb->splash(HZ*2, "Not a VBR file"); |
263 | } | 263 | } |
264 | 264 | ||
265 | return false; | 265 | return false; |
diff --git a/apps/plugins/video.c b/apps/plugins/video.c index 6cdf92e924..c2f64bbfa6 100644 --- a/apps/plugins/video.c +++ b/apps/plugins/video.c | |||
@@ -986,7 +986,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
986 | 986 | ||
987 | if (parameter == NULL) | 987 | if (parameter == NULL) |
988 | { | 988 | { |
989 | rb->splash(HZ*2, true, "Play .rvf file!"); | 989 | rb->splash(HZ*2, "Play .rvf file!"); |
990 | return PLUGIN_ERROR; | 990 | return PLUGIN_ERROR; |
991 | } | 991 | } |
992 | 992 | ||
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 543b5c0d1d..c12c1d41d2 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -1043,12 +1043,12 @@ static void viewer_load_settings(void) /* same name as global, but not the same | |||
1043 | settings_fd=rb->open(SETTINGS_FILE, O_RDONLY); | 1043 | settings_fd=rb->open(SETTINGS_FILE, O_RDONLY); |
1044 | if (settings_fd < 0) | 1044 | if (settings_fd < 0) |
1045 | { | 1045 | { |
1046 | rb->splash(HZ*2, true, "No Settings File"); | 1046 | rb->splash(HZ*2, "No Settings File"); |
1047 | return; | 1047 | return; |
1048 | } | 1048 | } |
1049 | if (rb->filesize(settings_fd) != sizeof(struct preferences)) | 1049 | if (rb->filesize(settings_fd) != sizeof(struct preferences)) |
1050 | { | 1050 | { |
1051 | rb->splash(HZ*2, true, "Settings File Invalid"); | 1051 | rb->splash(HZ*2, "Settings File Invalid"); |
1052 | return; | 1052 | return; |
1053 | } | 1053 | } |
1054 | 1054 | ||
@@ -1313,7 +1313,7 @@ static void viewer_menu(void) | |||
1313 | switch (result) | 1313 | switch (result) |
1314 | { | 1314 | { |
1315 | case 0: /* quit */ | 1315 | case 0: /* quit */ |
1316 | rb->splash(1, true, "Saving Settings"); | 1316 | rb->splash(1, "Saving Settings"); |
1317 | rb->menu_exit(m); | 1317 | rb->menu_exit(m); |
1318 | viewer_exit(NULL); | 1318 | viewer_exit(NULL); |
1319 | done = true; | 1319 | done = true; |
@@ -1350,7 +1350,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) | |||
1350 | file_name = file; | 1350 | file_name = file; |
1351 | ok = viewer_init(); | 1351 | ok = viewer_init(); |
1352 | if (!ok) { | 1352 | if (!ok) { |
1353 | rb->splash(HZ, false, "Error"); | 1353 | rb->splash(HZ, "Error"); |
1354 | viewer_exit(NULL); | 1354 | viewer_exit(NULL); |
1355 | return PLUGIN_OK; | 1355 | return PLUGIN_OK; |
1356 | } | 1356 | } |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 17f4e58165..0f1f72cbc5 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -327,9 +327,9 @@ void load_settings(void) { | |||
327 | else { | 327 | else { |
328 | reset_settings(); | 328 | reset_settings(); |
329 | #if CONFIG_KEYPAD == RECORDER_PAD | 329 | #if CONFIG_KEYPAD == RECORDER_PAD |
330 | rb->splash(HZ, true, "Press ON for help"); | 330 | rb->splash(HZ, "Press ON for help"); |
331 | #elif CONFIG_KEYPAD == ONDIO_PAD | 331 | #elif CONFIG_KEYPAD == ONDIO_PAD |
332 | rb->splash(HZ, true, "Press MODE for help"); | 332 | rb->splash(HZ, "Press MODE for help"); |
333 | #endif | 333 | #endif |
334 | } | 334 | } |
335 | } | 335 | } |
diff --git a/apps/plugins/wav2wv.c b/apps/plugins/wav2wv.c index 2e2076c0ed..07b1d225f8 100644 --- a/apps/plugins/wav2wv.c +++ b/apps/plugins/wav2wv.c | |||
@@ -124,19 +124,19 @@ static int wav2wv (char *filename) | |||
124 | extension = filename + rb->strlen (filename) - 3; | 124 | extension = filename + rb->strlen (filename) - 3; |
125 | 125 | ||
126 | if (rb->strcasecmp (extension, "wav")) { | 126 | if (rb->strcasecmp (extension, "wav")) { |
127 | rb->splash(HZ*2, true, "only for wav files!"); | 127 | rb->splash(HZ*2, "only for wav files!"); |
128 | return 1; | 128 | return 1; |
129 | } | 129 | } |
130 | 130 | ||
131 | in_fd = rb->open(filename, O_RDONLY); | 131 | in_fd = rb->open(filename, O_RDONLY); |
132 | 132 | ||
133 | if (in_fd < 0) { | 133 | if (in_fd < 0) { |
134 | rb->splash(HZ*2, true, "could not open file!"); | 134 | rb->splash(HZ*2, "could not open file!"); |
135 | return true; | 135 | return true; |
136 | } | 136 | } |
137 | 137 | ||
138 | if (rb->read (in_fd, &raw_header, sizeof (raw_header)) != sizeof (raw_header)) { | 138 | if (rb->read (in_fd, &raw_header, sizeof (raw_header)) != sizeof (raw_header)) { |
139 | rb->splash(HZ*2, true, "could not read file!"); | 139 | rb->splash(HZ*2, "could not read file!"); |
140 | return true; | 140 | return true; |
141 | } | 141 | } |
142 | 142 | ||
@@ -148,7 +148,7 @@ static int wav2wv (char *filename) | |||
148 | rb->strncmp (native_header.fmt_ckID, "fmt ", 4) || | 148 | rb->strncmp (native_header.fmt_ckID, "fmt ", 4) || |
149 | rb->strncmp (native_header.data_ckID, "data", 4) || | 149 | rb->strncmp (native_header.data_ckID, "data", 4) || |
150 | native_header.FormatTag != 1 || native_header.BitsPerSample != 16) { | 150 | native_header.FormatTag != 1 || native_header.BitsPerSample != 16) { |
151 | rb->splash(HZ*2, true, "incompatible wav file!"); | 151 | rb->splash(HZ*2, "incompatible wav file!"); |
152 | return true; | 152 | return true; |
153 | } | 153 | } |
154 | 154 | ||
@@ -164,7 +164,7 @@ static int wav2wv (char *filename) | |||
164 | /* config.flags |= CONFIG_HIGH_FLAG; */ | 164 | /* config.flags |= CONFIG_HIGH_FLAG; */ |
165 | 165 | ||
166 | if (!WavpackSetConfiguration (wpc, &config, total_samples)) { | 166 | if (!WavpackSetConfiguration (wpc, &config, total_samples)) { |
167 | rb->splash(HZ*2, true, "internal error!"); | 167 | rb->splash(HZ*2, "internal error!"); |
168 | rb->close (in_fd); | 168 | rb->close (in_fd); |
169 | return true; | 169 | return true; |
170 | } | 170 | } |
@@ -180,7 +180,7 @@ static int wav2wv (char *filename) | |||
180 | extension [1] = save_a; | 180 | extension [1] = save_a; |
181 | 181 | ||
182 | if (out_fd < 0) { | 182 | if (out_fd < 0) { |
183 | rb->splash(HZ*2, true, "could not create file!"); | 183 | rb->splash(HZ*2, "could not create file!"); |
184 | rb->close (in_fd); | 184 | rb->close (in_fd); |
185 | return true; | 185 | return true; |
186 | } | 186 | } |
@@ -201,7 +201,7 @@ static int wav2wv (char *filename) | |||
201 | bytes_count = samples_count * num_chans * 2; | 201 | bytes_count = samples_count * num_chans * 2; |
202 | 202 | ||
203 | if (rb->read (in_fd, input_buffer, bytes_count) != (int32_t) bytes_count) { | 203 | if (rb->read (in_fd, input_buffer, bytes_count) != (int32_t) bytes_count) { |
204 | rb->splash(HZ*2, true, "could not read file!"); | 204 | rb->splash(HZ*2, "could not read file!"); |
205 | error = true; | 205 | error = true; |
206 | break; | 206 | break; |
207 | } | 207 | } |
@@ -237,7 +237,7 @@ static int wav2wv (char *filename) | |||
237 | } | 237 | } |
238 | 238 | ||
239 | if (!WavpackPackSamples (wpc, temp_buffer, samples_this_pass)) { | 239 | if (!WavpackPackSamples (wpc, temp_buffer, samples_this_pass)) { |
240 | rb->splash(HZ*2, true, "internal error!"); | 240 | rb->splash(HZ*2, "internal error!"); |
241 | error = true; | 241 | error = true; |
242 | break; | 242 | break; |
243 | } | 243 | } |
@@ -251,7 +251,7 @@ static int wav2wv (char *filename) | |||
251 | bytes_count = WavpackFinishBlock (wpc); | 251 | bytes_count = WavpackFinishBlock (wpc); |
252 | 252 | ||
253 | if (rb->write (out_fd, output_buffer, bytes_count) != (int32_t) bytes_count) { | 253 | if (rb->write (out_fd, output_buffer, bytes_count) != (int32_t) bytes_count) { |
254 | rb->splash(HZ*2, true, "could not write file!"); | 254 | rb->splash(HZ*2, "could not write file!"); |
255 | error = true; | 255 | error = true; |
256 | break; | 256 | break; |
257 | } | 257 | } |
@@ -265,7 +265,7 @@ static int wav2wv (char *filename) | |||
265 | buttons = rb->button_status (); | 265 | buttons = rb->button_status (); |
266 | 266 | ||
267 | if (last_buttons == BUTTON_NONE && buttons != BUTTON_NONE) { | 267 | if (last_buttons == BUTTON_NONE && buttons != BUTTON_NONE) { |
268 | rb->splash(HZ*2, true, "operation aborted!"); | 268 | rb->splash(HZ*2, "operation aborted!"); |
269 | error = true; | 269 | error = true; |
270 | break; | 270 | break; |
271 | } | 271 | } |
@@ -285,7 +285,7 @@ static int wav2wv (char *filename) | |||
285 | extension [1] = save_a; | 285 | extension [1] = save_a; |
286 | } | 286 | } |
287 | else | 287 | else |
288 | rb->splash(HZ*3, true, "operation successful"); | 288 | rb->splash(HZ*3, "operation successful"); |
289 | 289 | ||
290 | return error; | 290 | return error; |
291 | } | 291 | } |
@@ -309,7 +309,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void *parameter) | |||
309 | audiobuf = rb->plugin_get_audio_buffer(&audiobuflen); | 309 | audiobuf = rb->plugin_get_audio_buffer(&audiobuflen); |
310 | 310 | ||
311 | if (audiobuflen < 0x200000) { | 311 | if (audiobuflen < 0x200000) { |
312 | rb->splash(HZ*2, true, "not enough memory!"); | 312 | rb->splash(HZ*2, "not enough memory!"); |
313 | return PLUGIN_ERROR; | 313 | return PLUGIN_ERROR; |
314 | } | 314 | } |
315 | 315 | ||
diff --git a/apps/plugins/wavplay.c b/apps/plugins/wavplay.c index 2d88ebc40d..faa5b0861a 100644 --- a/apps/plugins/wavplay.c +++ b/apps/plugins/wavplay.c | |||
@@ -3465,7 +3465,7 @@ int play_file(char* filename) | |||
3465 | fd = rb->open(filename, O_RDONLY); | 3465 | fd = rb->open(filename, O_RDONLY); |
3466 | if (fd < 0) | 3466 | if (fd < 0) |
3467 | { | 3467 | { |
3468 | rb->splash(2*HZ, true, "Couldn't open WAV file"); | 3468 | rb->splash(2*HZ, "Couldn't open WAV file"); |
3469 | return PLAY_ERROR; | 3469 | return PLAY_ERROR; |
3470 | } | 3470 | } |
3471 | 3471 | ||
@@ -3474,13 +3474,13 @@ int play_file(char* filename) | |||
3474 | got = rb->read(fd, aud_buf, wanted); /* wav header */ | 3474 | got = rb->read(fd, aud_buf, wanted); /* wav header */ |
3475 | if (got < 0) | 3475 | if (got < 0) |
3476 | { | 3476 | { |
3477 | rb->splash(2*HZ, true, "Read error"); | 3477 | rb->splash(2*HZ, "Read error"); |
3478 | rb->close(fd); | 3478 | rb->close(fd); |
3479 | return PLAY_ERROR; | 3479 | return PLAY_ERROR; |
3480 | } | 3480 | } |
3481 | else if (got < wanted) | 3481 | else if (got < wanted) |
3482 | { | 3482 | { |
3483 | rb->splash(2*HZ, true, "File too short"); | 3483 | rb->splash(2*HZ, "File too short"); |
3484 | rb->close(fd); | 3484 | rb->close(fd); |
3485 | return PLAY_ERROR; | 3485 | return PLAY_ERROR; |
3486 | } | 3486 | } |
@@ -3490,7 +3490,7 @@ int play_file(char* filename) | |||
3490 | || rb->memcmp(aud_buf + 12, "fmt ", 4) | 3490 | || rb->memcmp(aud_buf + 12, "fmt ", 4) |
3491 | || rb->memcmp(aud_buf + 36, "data", 4)) | 3491 | || rb->memcmp(aud_buf + 36, "data", 4)) |
3492 | { | 3492 | { |
3493 | rb->splash(2*HZ, true, "No canonical WAV file"); | 3493 | rb->splash(2*HZ, "No canonical WAV file"); |
3494 | rb->close(fd); | 3494 | rb->close(fd); |
3495 | return PLAY_ERROR; | 3495 | return PLAY_ERROR; |
3496 | } | 3496 | } |
@@ -3498,7 +3498,7 @@ int play_file(char* filename) | |||
3498 | format = letoh16(*(uint16_t *)(aud_buf + 20)); | 3498 | format = letoh16(*(uint16_t *)(aud_buf + 20)); |
3499 | if (format != 1) | 3499 | if (format != 1) |
3500 | { | 3500 | { |
3501 | rb->splash(2*HZ, true, "Unsupported format: %d", format); | 3501 | rb->splash(2*HZ, "Unsupported format: %d", format); |
3502 | rb->close(fd); | 3502 | rb->close(fd); |
3503 | return PLAY_ERROR; | 3503 | return PLAY_ERROR; |
3504 | } | 3504 | } |
@@ -3506,7 +3506,7 @@ int play_file(char* filename) | |||
3506 | channels = letoh16(*(uint16_t *)(aud_buf + 22)); | 3506 | channels = letoh16(*(uint16_t *)(aud_buf + 22)); |
3507 | if (channels > 2) | 3507 | if (channels > 2) |
3508 | { | 3508 | { |
3509 | rb->splash(2*HZ, true, "Too many channels: %d", channels); | 3509 | rb->splash(2*HZ, "Too many channels: %d", channels); |
3510 | rb->close(fd); | 3510 | rb->close(fd); |
3511 | return PLAY_ERROR; | 3511 | return PLAY_ERROR; |
3512 | } | 3512 | } |
@@ -3514,7 +3514,7 @@ int play_file(char* filename) | |||
3514 | samplebits = letoh16(*(uint16_t *)(aud_buf + 34)); | 3514 | samplebits = letoh16(*(uint16_t *)(aud_buf + 34)); |
3515 | if (samplebits != 16) | 3515 | if (samplebits != 16) |
3516 | { | 3516 | { |
3517 | rb->splash(2*HZ, true, "Unsupported sample depth: %dbit", samplebits); | 3517 | rb->splash(2*HZ, "Unsupported sample depth: %dbit", samplebits); |
3518 | rb->close(fd); | 3518 | rb->close(fd); |
3519 | return PLAY_ERROR; | 3519 | return PLAY_ERROR; |
3520 | } | 3520 | } |
@@ -3532,7 +3532,7 @@ int play_file(char* filename) | |||
3532 | case 44100: rate = 9; break; | 3532 | case 44100: rate = 9; break; |
3533 | case 48000: rate = 10; break; | 3533 | case 48000: rate = 10; break; |
3534 | default: | 3534 | default: |
3535 | rb->splash(2*HZ, true, "Unsupported samplerate: %dHz", samplerate); | 3535 | rb->splash(2*HZ, "Unsupported samplerate: %dHz", samplerate); |
3536 | rb->close(fd); | 3536 | rb->close(fd); |
3537 | return PLAY_ERROR; | 3537 | return PLAY_ERROR; |
3538 | } | 3538 | } |
@@ -3655,14 +3655,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
3655 | 3655 | ||
3656 | if (!parameter) | 3656 | if (!parameter) |
3657 | { | 3657 | { |
3658 | rb->splash(HZ, true, "Play WAV file!"); | 3658 | rb->splash(HZ, "Play WAV file!"); |
3659 | return PLUGIN_OK; | 3659 | return PLUGIN_OK; |
3660 | } | 3660 | } |
3661 | 3661 | ||
3662 | plug_buf = rb->plugin_get_buffer(&buf_size); | 3662 | plug_buf = rb->plugin_get_buffer(&buf_size); |
3663 | if (buf_size < 6700) /* needed for i2c transfer */ | 3663 | if (buf_size < 6700) /* needed for i2c transfer */ |
3664 | { | 3664 | { |
3665 | rb->splash(HZ, true, "Out of memory."); | 3665 | rb->splash(HZ, "Out of memory."); |
3666 | return PLUGIN_ERROR; | 3666 | return PLUGIN_ERROR; |
3667 | } | 3667 | } |
3668 | 3668 | ||
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index fcfcb35513..22f49e2298 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -1659,7 +1659,7 @@ static int run(void) | |||
1659 | cycle_start = *rb->current_tick; | 1659 | cycle_start = *rb->current_tick; |
1660 | } | 1660 | } |
1661 | 1661 | ||
1662 | rb->splash(HZ*2, true, "Game Over!"); | 1662 | rb->splash(HZ*2, "Game Over!"); |
1663 | 1663 | ||
1664 | return 2; /* back to menu */ | 1664 | return 2; /* back to menu */ |
1665 | } | 1665 | } |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 5669894c5e..bfbadd2e6c 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -573,7 +573,7 @@ static void die (void) | |||
573 | player.gameover = true; | 573 | player.gameover = true; |
574 | else { | 574 | else { |
575 | refresh_board (); | 575 | refresh_board (); |
576 | rb->splash (HZ, true, "Crash!"); | 576 | rb->splash (HZ, "Crash!"); |
577 | complete_trail (false); | 577 | complete_trail (false); |
578 | player.move = MOVE_NO; | 578 | player.move = MOVE_NO; |
579 | player.drawing = false; | 579 | player.drawing = false; |
@@ -700,13 +700,13 @@ static inline void move_board (void) | |||
700 | } | 700 | } |
701 | j = percentage (); | 701 | j = percentage (); |
702 | if (j > 75) { /* finished level */ | 702 | if (j > 75) { /* finished level */ |
703 | rb->splash (HZ * 2, true, "Level %d finished", player.level+1); | 703 | rb->splash (HZ * 2, "Level %d finished", player.level+1); |
704 | player.score += j; | 704 | player.score += j; |
705 | if (player.level < MAX_LEVEL) | 705 | if (player.level < MAX_LEVEL) |
706 | player.level++; | 706 | player.level++; |
707 | init_board (); | 707 | init_board (); |
708 | refresh_board (); | 708 | refresh_board (); |
709 | rb->splash (HZ * 2, true, "Ready?"); | 709 | rb->splash (HZ * 2, "Ready?"); |
710 | } | 710 | } |
711 | } | 711 | } |
712 | 712 | ||
@@ -785,7 +785,7 @@ static void init_game (void) | |||
785 | rb->lcd_setfont(FONT_SYSFIXED); | 785 | rb->lcd_setfont(FONT_SYSFIXED); |
786 | init_board (); | 786 | init_board (); |
787 | refresh_board (); | 787 | refresh_board (); |
788 | rb->splash (HZ * 2, true, "Ready?"); | 788 | rb->splash (HZ * 2, "Ready?"); |
789 | } | 789 | } |
790 | 790 | ||
791 | /* general keypad handler loop */ | 791 | /* general keypad handler loop */ |
@@ -801,7 +801,7 @@ static int xobox_loop (void) | |||
801 | #ifdef HAS_BUTTON_HOLD | 801 | #ifdef HAS_BUTTON_HOLD |
802 | if (rb->button_hold()) { | 802 | if (rb->button_hold()) { |
803 | pause = true; | 803 | pause = true; |
804 | rb->splash (HZ, true, "PAUSED"); | 804 | rb->splash (HZ, "PAUSED"); |
805 | } | 805 | } |
806 | #endif | 806 | #endif |
807 | 807 | ||
@@ -826,7 +826,7 @@ static int xobox_loop (void) | |||
826 | case PAUSE: | 826 | case PAUSE: |
827 | pause = !pause; | 827 | pause = !pause; |
828 | if (pause) | 828 | if (pause) |
829 | rb->splash (HZ, true, "Paused"); | 829 | rb->splash (HZ, "Paused"); |
830 | break; | 830 | break; |
831 | case QUIT: | 831 | case QUIT: |
832 | ret = game_menu (); | 832 | ret = game_menu (); |
@@ -845,7 +845,7 @@ static int xobox_loop (void) | |||
845 | refresh_board (); | 845 | refresh_board (); |
846 | } | 846 | } |
847 | if (player.gameover) { | 847 | if (player.gameover) { |
848 | rb->splash (HZ, true, "Game Over!"); | 848 | rb->splash (HZ, "Game Over!"); |
849 | ret = game_menu (); | 849 | ret = game_menu (); |
850 | if (ret == MENU_START) | 850 | if (ret == MENU_START) |
851 | init_game (); | 851 | init_game (); |
diff --git a/apps/plugins/zxbox/interf.c b/apps/plugins/zxbox/interf.c index 8e39e35d39..7f37262140 100644 --- a/apps/plugins/zxbox/interf.c +++ b/apps/plugins/zxbox/interf.c | |||
@@ -95,7 +95,7 @@ char *spif_get_tape_fileinfo(int *startp, int *nump) | |||
95 | void put_msg(const char *msg) | 95 | void put_msg(const char *msg) |
96 | { | 96 | { |
97 | #ifndef USE_GRAY | 97 | #ifndef USE_GRAY |
98 | rb->splash (HZ/2,true , msg ); | 98 | rb->splash (HZ/2, msg ); |
99 | #else | 99 | #else |
100 | LOGF(msg); | 100 | LOGF(msg); |
101 | (void)msg; | 101 | (void)msg; |
@@ -106,7 +106,7 @@ void put_msg(const char *msg) | |||
106 | void put_tmp_msg(const char *msg) | 106 | void put_tmp_msg(const char *msg) |
107 | { | 107 | { |
108 | #ifndef USE_GRAY | 108 | #ifndef USE_GRAY |
109 | rb->splash (HZ/10,true , msg ); | 109 | rb->splash (HZ/10, msg ); |
110 | #else | 110 | #else |
111 | LOGF(msg); | 111 | LOGF(msg); |
112 | (void)msg; | 112 | (void)msg; |
diff --git a/apps/plugins/zxbox/snapshot.c b/apps/plugins/zxbox/snapshot.c index d89e533d9e..5528b710c2 100644 --- a/apps/plugins/zxbox/snapshot.c +++ b/apps/plugins/zxbox/snapshot.c | |||
@@ -651,7 +651,7 @@ void load_snapshot_file_type(char *name, int type) | |||
651 | snsh = rb->open(filenamebuf, O_RDONLY); | 651 | snsh = rb->open(filenamebuf, O_RDONLY); |
652 | if(snsh < 0) { | 652 | if(snsh < 0) { |
653 | #ifndef USE_GRAY | 653 | #ifndef USE_GRAY |
654 | rb->splash(HZ,true, "Could not open snapshot file `%s'",filenamebuf); | 654 | rb->splash(HZ, "Could not open snapshot file `%s'",filenamebuf); |
655 | #endif | 655 | #endif |
656 | return; | 656 | return; |
657 | } | 657 | } |
diff --git a/apps/plugins/zxbox/spmain.c b/apps/plugins/zxbox/spmain.c index 20d806eef3..036e28a240 100644 --- a/apps/plugins/zxbox/spmain.c +++ b/apps/plugins/zxbox/spmain.c | |||
@@ -297,7 +297,7 @@ static void options_menu(void){ | |||
297 | no_yes, 2, NULL); | 297 | no_yes, 2, NULL); |
298 | if (new_setting != settings.invert_colors ) | 298 | if (new_setting != settings.invert_colors ) |
299 | settings.invert_colors=new_setting; | 299 | settings.invert_colors=new_setting; |
300 | rb->splash(HZ, true , "Restart to see effect"); | 300 | rb->splash(HZ, "Restart to see effect"); |
301 | break; | 301 | break; |
302 | case 3: | 302 | case 3: |
303 | new_setting = settings.frameskip; | 303 | new_setting = settings.frameskip; |
@@ -467,7 +467,7 @@ static void run_singlemode(void) | |||
467 | #ifdef USE_GRAY | 467 | #ifdef USE_GRAY |
468 | gray_show(false); | 468 | gray_show(false); |
469 | #endif | 469 | #endif |
470 | rb->splash(0,true,"Saving settings..."); | 470 | rb->splash(0, "Saving settings..."); |
471 | configfile_save(GLOBALCFG, config,sizeof(config)/sizeof(*config),SETTINGS_VERSION); | 471 | configfile_save(GLOBALCFG, config,sizeof(config)/sizeof(*config),SETTINGS_VERSION); |
472 | } | 472 | } |
473 | 473 | ||
@@ -531,7 +531,7 @@ static void init_load(void *parameter) | |||
531 | check_params (parameter); | 531 | check_params (parameter); |
532 | if(spcf_init_snapshot != NULL) { | 532 | if(spcf_init_snapshot != NULL) { |
533 | #ifndef USE_GRAY | 533 | #ifndef USE_GRAY |
534 | rb->splash(HZ,true, "Loading snapshot '%s'", spcf_init_snapshot); | 534 | rb->splash(HZ, "Loading snapshot '%s'", spcf_init_snapshot); |
535 | #endif | 535 | #endif |
536 | 536 | ||
537 | load_snapshot_file_type(spcf_init_snapshot, spcf_init_snapshot_type); | 537 | load_snapshot_file_type(spcf_init_snapshot, spcf_init_snapshot_type); |
diff --git a/apps/plugins/zxbox/zxbox.c b/apps/plugins/zxbox/zxbox.c index 5901982004..b85dc01991 100644 --- a/apps/plugins/zxbox/zxbox.c +++ b/apps/plugins/zxbox/zxbox.c | |||
@@ -64,7 +64,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
64 | 64 | ||
65 | rb = api; | 65 | rb = api; |
66 | rb->lcd_set_backdrop(NULL); | 66 | rb->lcd_set_backdrop(NULL); |
67 | rb->splash(HZ, true, "Welcome to ZXBox"); | 67 | rb->splash(HZ, "Welcome to ZXBox"); |
68 | 68 | ||
69 | 69 | ||
70 | sp_init(); | 70 | sp_init(); |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 4762bddb70..47ca978475 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -703,7 +703,7 @@ int radio_screen(void) | |||
703 | case ACTION_FM_PRESET: | 703 | case ACTION_FM_PRESET: |
704 | if(num_presets < 1) | 704 | if(num_presets < 1) |
705 | { | 705 | { |
706 | gui_syncsplash(HZ, true, str(LANG_FM_NO_PRESETS)); | 706 | gui_syncsplash(HZ, str(LANG_FM_NO_PRESETS)); |
707 | update_screen = true; | 707 | update_screen = true; |
708 | FOR_NB_SCREENS(i) | 708 | FOR_NB_SCREENS(i) |
709 | { | 709 | { |
@@ -737,7 +737,7 @@ int radio_screen(void) | |||
737 | case ACTION_FM_FREEZE: | 737 | case ACTION_FM_FREEZE: |
738 | if(!screen_freeze) | 738 | if(!screen_freeze) |
739 | { | 739 | { |
740 | gui_syncsplash(HZ, true, str(LANG_FM_FREEZE)); | 740 | gui_syncsplash(HZ, str(LANG_FM_FREEZE)); |
741 | screen_freeze = true; | 741 | screen_freeze = true; |
742 | } | 742 | } |
743 | else | 743 | else |
@@ -931,7 +931,7 @@ int radio_screen(void) | |||
931 | #if CONFIG_CODEC != SWCODEC | 931 | #if CONFIG_CODEC != SWCODEC |
932 | if(audio_status() & AUDIO_STATUS_ERROR) | 932 | if(audio_status() & AUDIO_STATUS_ERROR) |
933 | { | 933 | { |
934 | gui_syncsplash(0, true, str(LANG_DISK_FULL)); | 934 | gui_syncsplash(0, str(LANG_DISK_FULL)); |
935 | gui_syncstatusbar_draw(&statusbars,true); | 935 | gui_syncstatusbar_draw(&statusbars,true); |
936 | FOR_NB_SCREENS(i) | 936 | FOR_NB_SCREENS(i) |
937 | gui_textarea_update(&screens[i]); | 937 | gui_textarea_update(&screens[i]); |
@@ -1009,7 +1009,7 @@ static void radio_save_presets(void) | |||
1009 | } | 1009 | } |
1010 | else | 1010 | else |
1011 | { | 1011 | { |
1012 | gui_syncsplash(HZ, true, str(LANG_FM_PRESET_SAVE_FAILED)); | 1012 | gui_syncsplash(HZ, str(LANG_FM_PRESET_SAVE_FAILED)); |
1013 | } | 1013 | } |
1014 | } | 1014 | } |
1015 | 1015 | ||
@@ -1095,7 +1095,7 @@ static int radio_add_preset(void) | |||
1095 | } | 1095 | } |
1096 | else | 1096 | else |
1097 | { | 1097 | { |
1098 | gui_syncsplash(HZ, true, str(LANG_FM_NO_FREE_PRESETS)); | 1098 | gui_syncsplash(HZ, str(LANG_FM_NO_FREE_PRESETS)); |
1099 | } | 1099 | } |
1100 | return true; | 1100 | return true; |
1101 | } | 1101 | } |
@@ -1183,7 +1183,7 @@ static int save_preset_list(void) | |||
1183 | if((!p1) || (len > MAX_FILENAME) || (len == 0)) | 1183 | if((!p1) || (len > MAX_FILENAME) || (len == 0)) |
1184 | { | 1184 | { |
1185 | /* no slash, too long or too short */ | 1185 | /* no slash, too long or too short */ |
1186 | gui_syncsplash(HZ,true,str(LANG_INVALID_FILENAME)); | 1186 | gui_syncsplash(HZ, str(LANG_INVALID_FILENAME)); |
1187 | } | 1187 | } |
1188 | else | 1188 | else |
1189 | { | 1189 | { |
@@ -1203,7 +1203,7 @@ static int save_preset_list(void) | |||
1203 | } | 1203 | } |
1204 | } | 1204 | } |
1205 | else | 1205 | else |
1206 | gui_syncsplash(HZ,true,str(LANG_FM_NO_PRESETS)); | 1206 | gui_syncsplash(HZ, str(LANG_FM_NO_PRESETS)); |
1207 | 1207 | ||
1208 | return true; | 1208 | return true; |
1209 | } | 1209 | } |
@@ -1380,7 +1380,7 @@ static int scan_presets(void) | |||
1380 | freq /= 100; | 1380 | freq /= 100; |
1381 | 1381 | ||
1382 | snprintf(buf, MAX_FMPRESET_LEN, str(LANG_FM_SCANNING), freq, frac); | 1382 | snprintf(buf, MAX_FMPRESET_LEN, str(LANG_FM_SCANNING), freq, frac); |
1383 | gui_syncsplash(0, true, buf); | 1383 | gui_syncsplash(0, buf); |
1384 | 1384 | ||
1385 | if(radio_set(RADIO_SCAN_FREQUENCY, curr_freq)) | 1385 | if(radio_set(RADIO_SCAN_FREQUENCY, curr_freq)) |
1386 | { | 1386 | { |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index a80a0df2fc..ffde856612 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -538,7 +538,7 @@ int rec_create_directory(void) | |||
538 | rc = mkdir(rec_base_directory); | 538 | rc = mkdir(rec_base_directory); |
539 | if(rc < 0 && errno != EEXIST) | 539 | if(rc < 0 && errno != EEXIST) |
540 | { | 540 | { |
541 | gui_syncsplash(HZ * 2, true, | 541 | gui_syncsplash(HZ * 2, |
542 | "Can't create the %s directory. Error code %d.", | 542 | "Can't create the %s directory. Error code %d.", |
543 | rec_base_directory, rc); | 543 | rec_base_directory, rc); |
544 | return -1; | 544 | return -1; |
@@ -870,7 +870,7 @@ bool recording_screen(bool no_source) | |||
870 | screens[1].puts((screens[1].width/w - strlen(buf))/2 + 1, | 870 | screens[1].puts((screens[1].width/w - strlen(buf))/2 + 1, |
871 | screens[1].height/(h*2) + 1, buf); | 871 | screens[1].height/(h*2) + 1, buf); |
872 | screens[1].update(); | 872 | screens[1].update(); |
873 | gui_syncsplash(0, true, str(LANG_REMOTE_LCD_OFF)); | 873 | gui_syncsplash(0, str(LANG_REMOTE_LCD_OFF)); |
874 | } | 874 | } |
875 | #endif | 875 | #endif |
876 | 876 | ||
@@ -958,7 +958,7 @@ bool recording_screen(bool no_source) | |||
958 | screens[1].puts((screens[1].width/w - strlen(buf))/2 + 1, | 958 | screens[1].puts((screens[1].width/w - strlen(buf))/2 + 1, |
959 | screens[1].height/(h*2) + 1, buf); | 959 | screens[1].height/(h*2) + 1, buf); |
960 | screens[1].update(); | 960 | screens[1].update(); |
961 | gui_syncsplash(0, true, str(LANG_REMOTE_LCD_OFF)); | 961 | gui_syncsplash(0, str(LANG_REMOTE_LCD_OFF)); |
962 | } | 962 | } |
963 | else | 963 | else |
964 | { | 964 | { |
@@ -1741,7 +1741,7 @@ bool recording_screen(bool no_source) | |||
1741 | audio_stat = audio_status(); | 1741 | audio_stat = audio_status(); |
1742 | if (audio_stat & AUDIO_STATUS_ERROR) | 1742 | if (audio_stat & AUDIO_STATUS_ERROR) |
1743 | { | 1743 | { |
1744 | gui_syncsplash(0, true, str(LANG_SYSFONT_DISK_FULL)); | 1744 | gui_syncsplash(0, str(LANG_SYSFONT_DISK_FULL)); |
1745 | gui_syncstatusbar_draw(&statusbars, true); | 1745 | gui_syncstatusbar_draw(&statusbars, true); |
1746 | 1746 | ||
1747 | FOR_NB_SCREENS(i) | 1747 | FOR_NB_SCREENS(i) |
diff --git a/apps/root_menu.c b/apps/root_menu.c index 050f5be3c6..75846e3a6c 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c | |||
@@ -119,14 +119,14 @@ static int browser(void* param) | |||
119 | /* Maybe just needs to reboot due to delayed commit */ | 119 | /* Maybe just needs to reboot due to delayed commit */ |
120 | if (stat->commit_delayed) | 120 | if (stat->commit_delayed) |
121 | { | 121 | { |
122 | gui_syncsplash(HZ*2, true, str(LANG_PLEASE_REBOOT)); | 122 | gui_syncsplash(HZ*2, str(LANG_PLEASE_REBOOT)); |
123 | break; | 123 | break; |
124 | } | 124 | } |
125 | 125 | ||
126 | /* Check if ready status is known */ | 126 | /* Check if ready status is known */ |
127 | if (!stat->readyvalid) | 127 | if (!stat->readyvalid) |
128 | { | 128 | { |
129 | gui_syncsplash(0, true, str(LANG_TAGCACHE_BUSY)); | 129 | gui_syncsplash(0, str(LANG_TAGCACHE_BUSY)); |
130 | continue; | 130 | continue; |
131 | } | 131 | } |
132 | 132 | ||
@@ -151,13 +151,13 @@ static int browser(void* param) | |||
151 | /* Display building progress */ | 151 | /* Display building progress */ |
152 | if (stat->commit_step > 0) | 152 | if (stat->commit_step > 0) |
153 | { | 153 | { |
154 | gui_syncsplash(0, true, "%s [%d/%d]", | 154 | gui_syncsplash(0, "%s [%d/%d]", |
155 | str(LANG_TAGCACHE_INIT), stat->commit_step, | 155 | str(LANG_TAGCACHE_INIT), stat->commit_step, |
156 | tagcache_get_max_commit_step()); | 156 | tagcache_get_max_commit_step()); |
157 | } | 157 | } |
158 | else | 158 | else |
159 | { | 159 | { |
160 | gui_syncsplash(0, true, str(LANG_BUILDING_DATABASE), | 160 | gui_syncsplash(0, str(LANG_BUILDING_DATABASE), |
161 | stat->processed_entries); | 161 | stat->processed_entries); |
162 | } | 162 | } |
163 | } | 163 | } |
@@ -231,7 +231,7 @@ static int wpsscrn(void* param) | |||
231 | } | 231 | } |
232 | else | 232 | else |
233 | { | 233 | { |
234 | gui_syncsplash(HZ*2, true, str(LANG_NOTHING_TO_RESUME)); | 234 | gui_syncsplash(HZ*2, str(LANG_NOTHING_TO_RESUME)); |
235 | } | 235 | } |
236 | #if LCD_DEPTH > 1 | 236 | #if LCD_DEPTH > 1 |
237 | show_main_backdrop(); | 237 | show_main_backdrop(); |
diff --git a/apps/screens.c b/apps/screens.c index df1eb6a2f8..b078f735af 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -152,7 +152,7 @@ int mmc_remove_request(void) | |||
152 | int i; | 152 | int i; |
153 | FOR_NB_SCREENS(i) | 153 | FOR_NB_SCREENS(i) |
154 | screens[i].clear_display(); | 154 | screens[i].clear_display(); |
155 | gui_syncsplash(1, true, str(LANG_REMOVE_MMC)); | 155 | gui_syncsplash(1, str(LANG_REMOVE_MMC)); |
156 | if (global_settings.talk_menu) | 156 | if (global_settings.talk_menu) |
157 | talk_id(LANG_REMOVE_MMC, false); | 157 | talk_id(LANG_REMOVE_MMC, false); |
158 | 158 | ||
@@ -778,7 +778,7 @@ bool quick_screen_f3(int button_enter) | |||
778 | #if CONFIG_CHARGING || defined(SIMULATOR) | 778 | #if CONFIG_CHARGING || defined(SIMULATOR) |
779 | void charging_splash(void) | 779 | void charging_splash(void) |
780 | { | 780 | { |
781 | gui_syncsplash(2*HZ, true, (unsigned char *)str(LANG_BATTERY_CHARGE)); | 781 | gui_syncsplash(2*HZ, (unsigned char *)str(LANG_BATTERY_CHARGE)); |
782 | button_clear_queue(); | 782 | button_clear_queue(); |
783 | } | 783 | } |
784 | #endif | 784 | #endif |
@@ -1092,7 +1092,7 @@ bool shutdown_screen(void) | |||
1092 | 1092 | ||
1093 | lcd_stop_scroll(); | 1093 | lcd_stop_scroll(); |
1094 | 1094 | ||
1095 | gui_syncsplash(0, true, str(LANG_CONFIRM_SHUTDOWN)); | 1095 | gui_syncsplash(0, str(LANG_CONFIRM_SHUTDOWN)); |
1096 | 1096 | ||
1097 | while(!done && TIME_BEFORE(current_tick,time_entered+HZ*2)) | 1097 | while(!done && TIME_BEFORE(current_tick,time_entered+HZ*2)) |
1098 | { | 1098 | { |
diff --git a/apps/settings.c b/apps/settings.c index 0b2f2d9d40..57db619d72 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -596,15 +596,15 @@ bool settings_save_config(int options) | |||
596 | break; | 596 | break; |
597 | } | 597 | } |
598 | else { | 598 | else { |
599 | gui_syncsplash(HZ, true, str(LANG_MENU_SETTING_CANCEL)); | 599 | gui_syncsplash(HZ, str(LANG_MENU_SETTING_CANCEL)); |
600 | return false; | 600 | return false; |
601 | } | 601 | } |
602 | } | 602 | } |
603 | 603 | ||
604 | if (settings_write_config(filename, options)) | 604 | if (settings_write_config(filename, options)) |
605 | gui_syncsplash(HZ, true, str(LANG_SETTINGS_SAVED)); | 605 | gui_syncsplash(HZ, str(LANG_SETTINGS_SAVED)); |
606 | else | 606 | else |
607 | gui_syncsplash(HZ, true, str(LANG_FAILED)); | 607 | gui_syncsplash(HZ, str(LANG_FAILED)); |
608 | return true; | 608 | return true; |
609 | } | 609 | } |
610 | 610 | ||
@@ -1142,7 +1142,7 @@ static bool do_set_setting(const unsigned char* string, void *variable, | |||
1142 | { | 1142 | { |
1143 | if (*(int*)variable != oldvalue) | 1143 | if (*(int*)variable != oldvalue) |
1144 | { | 1144 | { |
1145 | gui_syncsplash(HZ/2,true,str(LANG_MENU_SETTING_CANCEL)); | 1145 | gui_syncsplash(HZ/2, str(LANG_MENU_SETTING_CANCEL)); |
1146 | *(int*)variable = oldvalue; | 1146 | *(int*)variable = oldvalue; |
1147 | } | 1147 | } |
1148 | } | 1148 | } |
@@ -1150,7 +1150,7 @@ static bool do_set_setting(const unsigned char* string, void *variable, | |||
1150 | { | 1150 | { |
1151 | if (*(bool*)variable != (bool)oldvalue) | 1151 | if (*(bool*)variable != (bool)oldvalue) |
1152 | { | 1152 | { |
1153 | gui_syncsplash(HZ/2,true,str(LANG_MENU_SETTING_CANCEL)); | 1153 | gui_syncsplash(HZ/2, str(LANG_MENU_SETTING_CANCEL)); |
1154 | *(bool*)variable = (bool)oldvalue; | 1154 | *(bool*)variable = (bool)oldvalue; |
1155 | } | 1155 | } |
1156 | } | 1156 | } |
diff --git a/apps/tagtree.c b/apps/tagtree.c index 59be2a857f..fadeeb52e1 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
@@ -673,10 +673,10 @@ static void tagtree_unbuffer_event(struct mp3entry *id3, bool last_track) | |||
673 | 673 | ||
674 | bool tagtree_export(void) | 674 | bool tagtree_export(void) |
675 | { | 675 | { |
676 | gui_syncsplash(0, true, str(LANG_CREATING)); | 676 | gui_syncsplash(0, str(LANG_CREATING)); |
677 | if (!tagcache_create_changelog(&tcs)) | 677 | if (!tagcache_create_changelog(&tcs)) |
678 | { | 678 | { |
679 | gui_syncsplash(HZ*2, true, str(LANG_FAILED)); | 679 | gui_syncsplash(HZ*2, str(LANG_FAILED)); |
680 | } | 680 | } |
681 | 681 | ||
682 | return false; | 682 | return false; |
@@ -684,10 +684,10 @@ bool tagtree_export(void) | |||
684 | 684 | ||
685 | bool tagtree_import(void) | 685 | bool tagtree_import(void) |
686 | { | 686 | { |
687 | gui_syncsplash(0, true, str(LANG_WAIT)); | 687 | gui_syncsplash(0, str(LANG_WAIT)); |
688 | if (!tagcache_import_changelog()) | 688 | if (!tagcache_import_changelog()) |
689 | { | 689 | { |
690 | gui_syncsplash(HZ*2, true, str(LANG_FAILED)); | 690 | gui_syncsplash(HZ*2, str(LANG_FAILED)); |
691 | } | 691 | } |
692 | 692 | ||
693 | return false; | 693 | return false; |
@@ -882,7 +882,7 @@ static bool show_search_progress(bool init, int count) | |||
882 | 882 | ||
883 | if (current_tick - last_tick > HZ/4) | 883 | if (current_tick - last_tick > HZ/4) |
884 | { | 884 | { |
885 | gui_syncsplash(0, true, str(LANG_PLAYLIST_SEARCH_MSG), count, | 885 | gui_syncsplash(0, str(LANG_PLAYLIST_SEARCH_MSG), count, |
886 | #if CONFIG_KEYPAD == PLAYER_PAD | 886 | #if CONFIG_KEYPAD == PLAYER_PAD |
887 | str(LANG_STOP_ABORT) | 887 | str(LANG_STOP_ABORT) |
888 | #else | 888 | #else |
@@ -1000,7 +1000,7 @@ static int retrieve_entries(struct tree_context *c, struct tagcache_search *tcs, | |||
1000 | ) | 1000 | ) |
1001 | { | 1001 | { |
1002 | show_search_progress(true, 0); | 1002 | show_search_progress(true, 0); |
1003 | gui_syncsplash(0, true, str(LANG_PLAYLIST_SEARCH_MSG), | 1003 | gui_syncsplash(0, str(LANG_PLAYLIST_SEARCH_MSG), |
1004 | 0, csi->name); | 1004 | 0, csi->name); |
1005 | } | 1005 | } |
1006 | 1006 | ||
@@ -1200,7 +1200,7 @@ static int retrieve_entries(struct tree_context *c, struct tagcache_search *tcs, | |||
1200 | 1200 | ||
1201 | if (!sort && (sort_inverse || sort_limit)) | 1201 | if (!sort && (sort_inverse || sort_limit)) |
1202 | { | 1202 | { |
1203 | gui_syncsplash(HZ*4, true, str(LANG_SHOWDIR_BUFFER_FULL), total_count); | 1203 | gui_syncsplash(HZ*4, str(LANG_SHOWDIR_BUFFER_FULL), total_count); |
1204 | logf("Too small dir buffer"); | 1204 | logf("Too small dir buffer"); |
1205 | return 0; | 1205 | return 0; |
1206 | } | 1206 | } |
@@ -1303,7 +1303,7 @@ int tagtree_load(struct tree_context* c) | |||
1303 | { | 1303 | { |
1304 | c->dirlevel = 0; | 1304 | c->dirlevel = 0; |
1305 | count = load_root(c); | 1305 | count = load_root(c); |
1306 | gui_syncsplash(HZ, true, str(LANG_TAGCACHE_BUSY)); | 1306 | gui_syncsplash(HZ, str(LANG_TAGCACHE_BUSY)); |
1307 | } | 1307 | } |
1308 | 1308 | ||
1309 | /* The _total_ numer of entries available. */ | 1309 | /* The _total_ numer of entries available. */ |
@@ -1468,7 +1468,7 @@ static bool insert_all_playlist(struct tree_context *c, int position, bool queue | |||
1468 | cpu_boost(true); | 1468 | cpu_boost(true); |
1469 | if (!tagcache_search(&tcs, tag_filename)) | 1469 | if (!tagcache_search(&tcs, tag_filename)) |
1470 | { | 1470 | { |
1471 | gui_syncsplash(HZ, true, str(LANG_TAGCACHE_BUSY)); | 1471 | gui_syncsplash(HZ, str(LANG_TAGCACHE_BUSY)); |
1472 | cpu_boost(false); | 1472 | cpu_boost(false); |
1473 | return false; | 1473 | return false; |
1474 | } | 1474 | } |
@@ -1571,12 +1571,12 @@ bool tagtree_insert_selection_playlist(int position, bool queue) | |||
1571 | } | 1571 | } |
1572 | 1572 | ||
1573 | if (tc->filesindir <= 0) | 1573 | if (tc->filesindir <= 0) |
1574 | gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST_PLAYER)); | 1574 | gui_syncsplash(HZ, str(LANG_END_PLAYLIST_PLAYER)); |
1575 | else | 1575 | else |
1576 | { | 1576 | { |
1577 | logf("insert_all_playlist"); | 1577 | logf("insert_all_playlist"); |
1578 | if (!insert_all_playlist(tc, position, queue)) | 1578 | if (!insert_all_playlist(tc, position, queue)) |
1579 | gui_syncsplash(HZ*2, true, str(LANG_FAILED)); | 1579 | gui_syncsplash(HZ*2, str(LANG_FAILED)); |
1580 | } | 1580 | } |
1581 | 1581 | ||
1582 | /* Finally return the dirlevel to its original value. */ | 1582 | /* Finally return the dirlevel to its original value. */ |
diff --git a/apps/tree.c b/apps/tree.c index d58c05deb7..a8723a44d5 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -242,10 +242,10 @@ bool check_rockboxdir(void) | |||
242 | int i; | 242 | int i; |
243 | FOR_NB_SCREENS(i) | 243 | FOR_NB_SCREENS(i) |
244 | screens[i].clear_display(); | 244 | screens[i].clear_display(); |
245 | gui_syncsplash(HZ*2, true, "No .rockbox directory"); | 245 | gui_syncsplash(HZ*2, "No .rockbox directory"); |
246 | FOR_NB_SCREENS(i) | 246 | FOR_NB_SCREENS(i) |
247 | screens[i].clear_display(); | 247 | screens[i].clear_display(); |
248 | gui_syncsplash(HZ*2, true, "Installation incomplete"); | 248 | gui_syncsplash(HZ*2, "Installation incomplete"); |
249 | return false; | 249 | return false; |
250 | } | 250 | } |
251 | closedir(dir); | 251 | closedir(dir); |
@@ -366,7 +366,7 @@ static int update_dir(void) | |||
366 | (tc.dirfull || | 366 | (tc.dirfull || |
367 | tc.filesindir == global_settings.max_files_in_dir) ) | 367 | tc.filesindir == global_settings.max_files_in_dir) ) |
368 | { | 368 | { |
369 | gui_syncsplash(HZ, true, str(LANG_SHOWDIR_BUFFER_FULL)); | 369 | gui_syncsplash(HZ, str(LANG_SHOWDIR_BUFFER_FULL)); |
370 | } | 370 | } |
371 | } | 371 | } |
372 | #ifdef HAVE_TAGCACHE | 372 | #ifdef HAVE_TAGCACHE |
@@ -606,7 +606,7 @@ int dirbrowse() | |||
606 | 606 | ||
607 | if (*tc.dirfilter > NUM_FILTER_MODES && numentries==0) | 607 | if (*tc.dirfilter > NUM_FILTER_MODES && numentries==0) |
608 | { | 608 | { |
609 | gui_syncsplash(HZ*2, true, str(LANG_NO_FILES)); | 609 | gui_syncsplash(HZ*2, str(LANG_NO_FILES)); |
610 | return false; /* No files found for rockbox_browser() */ | 610 | return false; /* No files found for rockbox_browser() */ |
611 | } | 611 | } |
612 | 612 | ||