diff options
author | Nils Wallménius <nils@rockbox.org> | 2008-08-15 08:27:39 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2008-08-15 08:27:39 +0000 |
commit | 01729e7a1841d8aae7be37707dbc7146348c9a64 (patch) | |
tree | 5490fd9eccdcaef39bbbb91e8a44d1caad9b2ef7 /apps/plugins | |
parent | 9464fdde2d780206e1eddba8cafbfbd4bbff83e4 (diff) | |
download | rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.gz rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.zip |
FS#9281 Rename of splash functions.
* Remove gui_splash()
* Rename gui_syncsplash() to splashf() and remove its voice
capabilities.
* Rename the internal splash() to splash_internal() and introduce an
externally visible splash() that handles simple splashing without
printf functionality e.g. splash(HZ, ID2P(LANG_FOO)); or splash(HZ,
"foo"); if a LANG_* id is passed it will be voiced.
* Adjust all places that called gui_syncsplash() to use the correct
variant from above.
* Export both new functions to plugins and adjust places calling
rb->splash() to use the correct variant so that we now have naming
consistency between the core and plugins.
* Fix one latent bug that would cause my sim to crash with the above
changes and correct P2STR and P2ID macros, thanks to pondlife.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18282 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
30 files changed, 68 insertions, 68 deletions
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 97aef29b57..be94036f4e 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -2319,7 +2319,7 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock, | |||
2319 | 2319 | ||
2320 | case BUBBLES_START: /* pause the game */ | 2320 | case BUBBLES_START: /* pause the game */ |
2321 | start = *rb->current_tick; | 2321 | start = *rb->current_tick; |
2322 | rb->splash(1, "Paused"); | 2322 | rb->splash(0, "Paused"); |
2323 | while(pluginlib_getaction(rb,TIMEOUT_BLOCK,plugin_contexts,2) | 2323 | while(pluginlib_getaction(rb,TIMEOUT_BLOCK,plugin_contexts,2) |
2324 | != (BUBBLES_START)); | 2324 | != (BUBBLES_START)); |
2325 | bb->startedshot += *rb->current_tick-start; | 2325 | bb->startedshot += *rb->current_tick-start; |
diff --git a/apps/plugins/iriverify.c b/apps/plugins/iriverify.c index c88ddc7b09..7e77ae3e69 100644 --- a/apps/plugins/iriverify.c +++ b/apps/plugins/iriverify.c | |||
@@ -159,13 +159,13 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
159 | FOR_NB_SCREENS(i) | 159 | FOR_NB_SCREENS(i) |
160 | rb->screens[i]->clear_display(); | 160 | rb->screens[i]->clear_display(); |
161 | if(rc < 0) { | 161 | if(rc < 0) { |
162 | rb->splash(HZ, "Can't write file: %d", rc); | 162 | rb->splashf(HZ, "Can't write file: %d", rc); |
163 | } else { | 163 | } else { |
164 | rb->splash(HZ, "Done"); | 164 | rb->splash(HZ, "Done"); |
165 | } | 165 | } |
166 | } else { | 166 | } else { |
167 | if(rc < 0) { | 167 | if(rc < 0) { |
168 | rb->splash(HZ, "Can't read file: %d", rc); | 168 | rb->splashf(HZ, "Can't read file: %d", rc); |
169 | } else { | 169 | } else { |
170 | rb->splash(HZ, "The file is too big"); | 170 | rb->splash(HZ, "The file is too big"); |
171 | } | 171 | } |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 48735a2b44..7f4cd4bd41 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -1261,7 +1261,7 @@ static void jewels_nextlevel(struct game_context* bj) { | |||
1261 | while(bj->score >= LEVEL_PTS) { | 1261 | while(bj->score >= LEVEL_PTS) { |
1262 | bj->score -= LEVEL_PTS; | 1262 | bj->score -= LEVEL_PTS; |
1263 | bj->level++; | 1263 | bj->level++; |
1264 | rb->splash(HZ*2, "Level %d", bj->level); | 1264 | rb->splashf(HZ*2, "Level %d", bj->level); |
1265 | jewels_drawboard(bj); | 1265 | jewels_drawboard(bj); |
1266 | } | 1266 | } |
1267 | 1267 | ||
@@ -1283,7 +1283,7 @@ static void jewels_nextlevel(struct game_context* bj) { | |||
1283 | rb->splash(HZ*2, "You win!"); | 1283 | rb->splash(HZ*2, "You win!"); |
1284 | bj->level = 1; | 1284 | bj->level = 1; |
1285 | } else { | 1285 | } else { |
1286 | rb->splash(HZ*2, "Level %d", bj->level); | 1286 | rb->splashf(HZ*2, "Level %d", bj->level); |
1287 | } | 1287 | } |
1288 | break; | 1288 | break; |
1289 | } | 1289 | } |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index a17c6d7729..ffc9d49a98 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -3026,7 +3026,7 @@ struct t_disp* get_image(struct jpeg* p_jpg, int ds) | |||
3026 | #endif | 3026 | #endif |
3027 | if (status) | 3027 | if (status) |
3028 | { | 3028 | { |
3029 | rb->splash(HZ, "decode error %d", status); | 3029 | rb->splashf(HZ, "decode error %d", status); |
3030 | file_pt[curfile] = '\0'; | 3030 | file_pt[curfile] = '\0'; |
3031 | return NULL; | 3031 | return NULL; |
3032 | } | 3032 | } |
@@ -3212,7 +3212,7 @@ int load_and_show(char* filename) | |||
3212 | 3212 | ||
3213 | if (status < 0 || (status & (DQT | SOF0)) != (DQT | SOF0)) | 3213 | if (status < 0 || (status & (DQT | SOF0)) != (DQT | SOF0)) |
3214 | { /* bad format or minimum components not contained */ | 3214 | { /* bad format or minimum components not contained */ |
3215 | rb->splash(HZ, "unsupported %d", status); | 3215 | rb->splashf(HZ, "unsupported %d", status); |
3216 | file_pt[curfile] = '\0'; | 3216 | file_pt[curfile] = '\0'; |
3217 | return change_filename(direction); | 3217 | return change_filename(direction); |
3218 | } | 3218 | } |
diff --git a/apps/plugins/keybox.c b/apps/plugins/keybox.c index 389299d580..fef3d4f23a 100644 --- a/apps/plugins/keybox.c +++ b/apps/plugins/keybox.c | |||
@@ -312,9 +312,9 @@ static void splash_pw(int selected_item) | |||
312 | entry = entry->next; | 312 | entry = entry->next; |
313 | } | 313 | } |
314 | if (entry->name != '\0') | 314 | if (entry->name != '\0') |
315 | rb->splash(0, "%s %s", entry->name, entry->password); | 315 | rb->splashf(0, "%s %s", entry->name, entry->password); |
316 | else | 316 | else |
317 | rb->splash(0, "%s", entry->password); | 317 | rb->splashf(0, "%s", entry->password); |
318 | rb->get_action(CONTEXT_STD, TIMEOUT_BLOCK); | 318 | rb->get_action(CONTEXT_STD, TIMEOUT_BLOCK); |
319 | } | 319 | } |
320 | 320 | ||
diff --git a/apps/plugins/lib/overlay.c b/apps/plugins/lib/overlay.c index a779722d88..706d6c14a7 100644 --- a/apps/plugins/lib/overlay.c +++ b/apps/plugins/lib/overlay.c | |||
@@ -57,7 +57,7 @@ enum plugin_status run_overlay(const struct plugin_api* rb, const void* paramete | |||
57 | fd = rb->open(filename, O_RDONLY); | 57 | fd = rb->open(filename, O_RDONLY); |
58 | if (fd < 0) | 58 | if (fd < 0) |
59 | { | 59 | { |
60 | rb->splash(2*HZ, "Can't open %s", filename); | 60 | rb->splashf(2*HZ, "Can't open %s", filename); |
61 | return PLUGIN_ERROR; | 61 | return PLUGIN_ERROR; |
62 | } | 62 | } |
63 | readsize = rb->read(fd, &header, sizeof(header)); | 63 | readsize = rb->read(fd, &header, sizeof(header)); |
@@ -67,17 +67,17 @@ enum plugin_status run_overlay(const struct plugin_api* rb, const void* paramete | |||
67 | 67 | ||
68 | if (readsize != sizeof(header)) | 68 | if (readsize != sizeof(header)) |
69 | { | 69 | { |
70 | rb->splash(2*HZ, "Reading %s overlay failed.", name); | 70 | rb->splashf(2*HZ, "Reading %s overlay failed.", name); |
71 | return PLUGIN_ERROR; | 71 | return PLUGIN_ERROR; |
72 | } | 72 | } |
73 | if (header.magic != PLUGIN_MAGIC || header.target_id != TARGET_ID) | 73 | if (header.magic != PLUGIN_MAGIC || header.target_id != TARGET_ID) |
74 | { | 74 | { |
75 | rb->splash(2*HZ, "%s overlay: Incompatible model.", name); | 75 | rb->splashf(2*HZ, "%s overlay: Incompatible model.", name); |
76 | return PLUGIN_ERROR; | 76 | return PLUGIN_ERROR; |
77 | } | 77 | } |
78 | if (header.api_version != PLUGIN_API_VERSION) | 78 | if (header.api_version != PLUGIN_API_VERSION) |
79 | { | 79 | { |
80 | rb->splash(2*HZ, "%s overlay: Incompatible version.", name); | 80 | rb->splashf(2*HZ, "%s overlay: Incompatible version.", name); |
81 | return PLUGIN_ERROR; | 81 | return PLUGIN_ERROR; |
82 | } | 82 | } |
83 | 83 | ||
@@ -85,14 +85,14 @@ enum plugin_status run_overlay(const struct plugin_api* rb, const void* paramete | |||
85 | if (header.load_addr < audiobuf || | 85 | if (header.load_addr < audiobuf || |
86 | header.end_addr > audiobuf + audiobuf_size) | 86 | header.end_addr > audiobuf + audiobuf_size) |
87 | { | 87 | { |
88 | rb->splash(2*HZ, "%s overlay doesn't fit into memory.", name); | 88 | rb->splashf(2*HZ, "%s overlay doesn't fit into memory.", name); |
89 | return PLUGIN_ERROR; | 89 | return PLUGIN_ERROR; |
90 | } | 90 | } |
91 | 91 | ||
92 | fd = rb->open(filename, O_RDONLY); | 92 | fd = rb->open(filename, O_RDONLY); |
93 | if (fd < 0) | 93 | if (fd < 0) |
94 | { | 94 | { |
95 | rb->splash(2*HZ, "Can't open %s", filename); | 95 | rb->splashf(2*HZ, "Can't open %s", filename); |
96 | return PLUGIN_ERROR; | 96 | return PLUGIN_ERROR; |
97 | } | 97 | } |
98 | readsize = rb->read(fd, header.load_addr, header.end_addr - header.load_addr); | 98 | readsize = rb->read(fd, header.load_addr, header.end_addr - header.load_addr); |
@@ -100,7 +100,7 @@ enum plugin_status run_overlay(const struct plugin_api* rb, const void* paramete | |||
100 | 100 | ||
101 | if (readsize < 0) | 101 | if (readsize < 0) |
102 | { | 102 | { |
103 | rb->splash(2*HZ, "Reading %s overlay failed.", name); | 103 | rb->splashf(2*HZ, "Reading %s overlay failed.", name); |
104 | return PLUGIN_ERROR; | 104 | return PLUGIN_ERROR; |
105 | } | 105 | } |
106 | /* Zero out bss area */ | 106 | /* Zero out bss area */ |
diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c index 1868601cd9..c1726a5e95 100644 --- a/apps/plugins/mazezam.c +++ b/apps/plugins/mazezam.c | |||
@@ -715,7 +715,7 @@ static void play_level(short level, short lives, bool new_level) | |||
715 | */ | 715 | */ |
716 | rb->lcd_remote_clear_display(); | 716 | rb->lcd_remote_clear_display(); |
717 | #endif | 717 | #endif |
718 | rb->splash(MAZEZAM_DELAY_LIVES, MAZEZAM_TEXT_LIVES, | 718 | rb->splashf(MAZEZAM_DELAY_LIVES, MAZEZAM_TEXT_LIVES, |
719 | level+1, lives); | 719 | level+1, lives); |
720 | 720 | ||
721 | /* ensure keys pressed during the splash screen are ignored */ | 721 | /* ensure keys pressed during the splash screen are ignored */ |
diff --git a/apps/plugins/md5sum.c b/apps/plugins/md5sum.c index 084256badf..f95cd20f20 100644 --- a/apps/plugins/md5sum.c +++ b/apps/plugins/md5sum.c | |||
@@ -58,7 +58,7 @@ static void hash_file( int out, const char *path ) | |||
58 | { | 58 | { |
59 | char string[MD5_STRING_LENGTH+1]; | 59 | char string[MD5_STRING_LENGTH+1]; |
60 | done++; | 60 | done++; |
61 | rb->splash( 0, "%d / %d : %s", done, count, path ); | 61 | rb->splashf( 0, "%d / %d : %s", done, count, path ); |
62 | if( hash( string, path ) ) | 62 | if( hash( string, path ) ) |
63 | rb->write( out, "error", 5 ); | 63 | rb->write( out, "error", 5 ); |
64 | else | 64 | else |
@@ -140,7 +140,7 @@ static void hash_check( int out, const char *path ) | |||
140 | { | 140 | { |
141 | const char *filename = rb->strchr( line, ' ' ); | 141 | const char *filename = rb->strchr( line, ' ' ); |
142 | done++; | 142 | done++; |
143 | rb->splash( 0, "%d / %d : %s", done, count, filename ); | 143 | rb->splashf( 0, "%d / %d : %s", done, count, filename ); |
144 | if( !filename || len < MD5_STRING_LENGTH + 2 ) | 144 | if( !filename || len < MD5_STRING_LENGTH + 2 ) |
145 | { | 145 | { |
146 | const char error[] = "Malformed input line ... skipping"; | 146 | const char error[] = "Malformed input line ... skipping"; |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 16cc0fcd87..266d12fc8d 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -749,12 +749,12 @@ enum minesweeper_status minesweeper( void ) | |||
749 | break; | 749 | break; |
750 | flags_used = count_flags(); | 750 | flags_used = count_flags(); |
751 | if (flags_used == 1) { | 751 | if (flags_used == 1) { |
752 | rb->splash( HZ*2, "You marked 1 field. There are %d mines.", | 752 | rb->splashf( HZ*2, "You marked 1 field. There are %d mines.", |
753 | mine_num ); | 753 | mine_num ); |
754 | } | 754 | } |
755 | else | 755 | else |
756 | { | 756 | { |
757 | rb->splash( HZ*2, "You marked %d fields. There are %d mines.", | 757 | rb->splashf( HZ*2, "You marked %d fields. There are %d mines.", |
758 | flags_used, mine_num ); | 758 | flags_used, mine_num ); |
759 | } | 759 | } |
760 | break; | 760 | break; |
diff --git a/apps/plugins/mpegplayer/disk_buf.c b/apps/plugins/mpegplayer/disk_buf.c index f37797bc9e..7ba4025f1e 100644 --- a/apps/plugins/mpegplayer/disk_buf.c +++ b/apps/plugins/mpegplayer/disk_buf.c | |||
@@ -151,7 +151,7 @@ static inline void disk_buf_buffer(void) | |||
151 | wm : AVERAGE(disk_buf.low_wm, wm, 16); | 151 | wm : AVERAGE(disk_buf.low_wm, wm, 16); |
152 | 152 | ||
153 | #if 0 | 153 | #if 0 |
154 | rb->splash(0, "*%10ld %10ld", disk_buf.low_wm, | 154 | rb->splashf(0, "*%10ld %10ld", disk_buf.low_wm, |
155 | disk_buf.win_right - sw.right); | 155 | disk_buf.win_right - sw.right); |
156 | #endif | 156 | #endif |
157 | 157 | ||
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index c775a14f65..c58a2f6d0f 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -1674,7 +1674,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
1674 | errstring = "Error opening file: %d"; | 1674 | errstring = "Error opening file: %d"; |
1675 | } | 1675 | } |
1676 | 1676 | ||
1677 | rb->splash(HZ*2, errstring, err); | 1677 | rb->splashf(HZ*2, errstring, err); |
1678 | } | 1678 | } |
1679 | } | 1679 | } |
1680 | 1680 | ||
diff --git a/apps/plugins/pacbox/pacbox.c b/apps/plugins/pacbox/pacbox.c index 16860f9d25..c4ee037b5a 100644 --- a/apps/plugins/pacbox/pacbox.c +++ b/apps/plugins/pacbox/pacbox.c | |||
@@ -421,7 +421,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
421 | SETTINGS_VERSION); | 421 | SETTINGS_VERSION); |
422 | } | 422 | } |
423 | } else { | 423 | } else { |
424 | rb->splash(HZ*2, "No ROMs in %s/pacman/", ROCKBOX_DIR); | 424 | rb->splashf(HZ*2, "No ROMs in %s/pacman/", ROCKBOX_DIR); |
425 | } | 425 | } |
426 | 426 | ||
427 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | 427 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/apps/plugins/ppmviewer.c b/apps/plugins/ppmviewer.c index 4c24a5d5f4..01513c4877 100644 --- a/apps/plugins/ppmviewer.c +++ b/apps/plugins/ppmviewer.c | |||
@@ -36,7 +36,7 @@ PLUGIN_HEADER | |||
36 | #define PPM_OVERALLMAXVAL 65535 | 36 | #define PPM_OVERALLMAXVAL 65535 |
37 | #define PPM_MAXSIZE (300*1024)/sizeof(fb_data) | 37 | #define PPM_MAXSIZE (300*1024)/sizeof(fb_data) |
38 | 38 | ||
39 | #define ppm_error(...) rb->splash(HZ*2, __VA_ARGS__ ) | 39 | #define ppm_error(...) rb->splashf(HZ*2, __VA_ARGS__ ) |
40 | 40 | ||
41 | static fb_data buffer[PPM_MAXSIZE]; | 41 | static fb_data buffer[PPM_MAXSIZE]; |
42 | static fb_data lcd_buf[LCD_WIDTH * LCD_HEIGHT]; | 42 | static fb_data lcd_buf[LCD_WIDTH * LCD_HEIGHT]; |
diff --git a/apps/plugins/properties.c b/apps/plugins/properties.c index 86955a7b57..22288d406f 100644 --- a/apps/plugins/properties.c +++ b/apps/plugins/properties.c | |||
@@ -292,7 +292,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
292 | if(!found) | 292 | if(!found) |
293 | { | 293 | { |
294 | /* weird: we couldn't find the entry. This Should Never Happen (TM) */ | 294 | /* weird: we couldn't find the entry. This Should Never Happen (TM) */ |
295 | rb->splash(0, "File/Dir not found: %s", file); | 295 | rb->splashf(0, "File/Dir not found: %s", file); |
296 | rb->action_userabort(TIMEOUT_BLOCK); | 296 | rb->action_userabort(TIMEOUT_BLOCK); |
297 | return PLUGIN_OK; | 297 | return PLUGIN_OK; |
298 | } | 298 | } |
diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c index c03a794e73..3df38082ba 100644 --- a/apps/plugins/random_folder_advance_config.c +++ b/apps/plugins/random_folder_advance_config.c | |||
@@ -219,7 +219,7 @@ void generate(void) | |||
219 | rb->write(fd,&dirs_count,sizeof(int)); | 219 | rb->write(fd,&dirs_count,sizeof(int)); |
220 | if (fd < 0) | 220 | if (fd < 0) |
221 | { | 221 | { |
222 | rb->splash(HZ, "Couldnt open %s", RFA_FILE); | 222 | rb->splashf(HZ, "Couldnt open %s", RFA_FILE); |
223 | return; | 223 | return; |
224 | } | 224 | } |
225 | #ifndef HAVE_LCD_CHARCELLS | 225 | #ifndef HAVE_LCD_CHARCELLS |
@@ -295,7 +295,7 @@ int edit_list(void) | |||
295 | /* load the dat file if not already done */ | 295 | /* load the dat file if not already done */ |
296 | if ((list == NULL || list->count == 0) && (i = load_list()) != 0) | 296 | if ((list == NULL || list->count == 0) && (i = load_list()) != 0) |
297 | { | 297 | { |
298 | rb->splash(HZ*2, "Could not load %s, rv = %d", RFA_FILE, i); | 298 | rb->splashf(HZ*2, "Could not load %s, rv = %d", RFA_FILE, i); |
299 | return -1; | 299 | return -1; |
300 | } | 300 | } |
301 | 301 | ||
@@ -387,13 +387,13 @@ int export_list_to_file_text(void) | |||
387 | /* load the dat file if not already done */ | 387 | /* load the dat file if not already done */ |
388 | if ((list == NULL || list->count == 0) && (i = load_list()) != 0) | 388 | if ((list == NULL || list->count == 0) && (i = load_list()) != 0) |
389 | { | 389 | { |
390 | rb->splash(HZ*2, "Could not load %s, rv = %d", RFA_FILE, i); | 390 | rb->splashf(HZ*2, "Could not load %s, rv = %d", RFA_FILE, i); |
391 | return 0; | 391 | return 0; |
392 | } | 392 | } |
393 | 393 | ||
394 | if (list->count <= 0) | 394 | if (list->count <= 0) |
395 | { | 395 | { |
396 | rb->splash(HZ*2, "no dirs in list file: %s", RFA_FILE); | 396 | rb->splashf(HZ*2, "no dirs in list file: %s", RFA_FILE); |
397 | return 0; | 397 | return 0; |
398 | } | 398 | } |
399 | 399 | ||
@@ -401,7 +401,7 @@ int export_list_to_file_text(void) | |||
401 | int myfd = rb->creat(RFA_FILE_TEXT); | 401 | int myfd = rb->creat(RFA_FILE_TEXT); |
402 | if (myfd < 0) | 402 | if (myfd < 0) |
403 | { | 403 | { |
404 | rb->splash(HZ*4, "failed to open: fd = %d, file = %s", | 404 | rb->splashf(HZ*4, "failed to open: fd = %d, file = %s", |
405 | myfd, RFA_FILE_TEXT); | 405 | myfd, RFA_FILE_TEXT); |
406 | return -1; | 406 | return -1; |
407 | } | 407 | } |
@@ -434,7 +434,7 @@ int import_list_from_file_text(void) | |||
434 | int myfd = rb->open(RFA_FILE_TEXT, O_RDONLY); | 434 | int myfd = rb->open(RFA_FILE_TEXT, O_RDONLY); |
435 | if (myfd < 0) | 435 | if (myfd < 0) |
436 | { | 436 | { |
437 | rb->splash(HZ*2, "failed to open: %s", RFA_FILE_TEXT); | 437 | rb->splashf(HZ*2, "failed to open: %s", RFA_FILE_TEXT); |
438 | return -1; | 438 | return -1; |
439 | } | 439 | } |
440 | 440 | ||
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index c4e6328923..6436d9baa5 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -2520,12 +2520,12 @@ static void goto_menu(void) | |||
2520 | { | 2520 | { |
2521 | if( load_bitmap( filename ) <= 0 ) | 2521 | if( load_bitmap( filename ) <= 0 ) |
2522 | { | 2522 | { |
2523 | rb->splash( 1*HZ, "Error while loading %s", | 2523 | rb->splashf( 1*HZ, "Error while loading %s", |
2524 | filename ); | 2524 | filename ); |
2525 | } | 2525 | } |
2526 | else | 2526 | else |
2527 | { | 2527 | { |
2528 | rb->splash( 1*HZ, "Image loaded (%s)", filename ); | 2528 | rb->splashf( 1*HZ, "Image loaded (%s)", filename ); |
2529 | restore_screen(); | 2529 | restore_screen(); |
2530 | inv_cursor(true); | 2530 | inv_cursor(true); |
2531 | return; | 2531 | return; |
@@ -2542,7 +2542,7 @@ static void goto_menu(void) | |||
2542 | rb->strcasecmp(&filename[rb->strlen(filename)-4], ".bmp")) | 2542 | rb->strcasecmp(&filename[rb->strlen(filename)-4], ".bmp")) |
2543 | rb->strcat(filename, ".bmp"); | 2543 | rb->strcat(filename, ".bmp"); |
2544 | save_bitmap( filename ); | 2544 | save_bitmap( filename ); |
2545 | rb->splash( 1*HZ, "File saved (%s)", filename ); | 2545 | rb->splashf( 1*HZ, "File saved (%s)", filename ); |
2546 | } | 2546 | } |
2547 | break; | 2547 | break; |
2548 | 2548 | ||
@@ -3011,7 +3011,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
3011 | } | 3011 | } |
3012 | else | 3012 | else |
3013 | { | 3013 | { |
3014 | rb->splash( 1*HZ, "Image loaded (%s)", (char *)parameter ); | 3014 | rb->splashf( 1*HZ, "Image loaded (%s)", (char *)parameter ); |
3015 | restore_screen(); | 3015 | restore_screen(); |
3016 | rb->strcpy( filename, parameter ); | 3016 | rb->strcpy( filename, parameter ); |
3017 | } | 3017 | } |
diff --git a/apps/plugins/shortcuts/shortcuts_append.c b/apps/plugins/shortcuts/shortcuts_append.c index 0e73d2caa1..0d74767a87 100644 --- a/apps/plugins/shortcuts/shortcuts_append.c +++ b/apps/plugins/shortcuts/shortcuts_append.c | |||
@@ -85,7 +85,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* void_p | |||
85 | if (!found) { | 85 | if (!found) { |
86 | /* Something's gone properly pear shaped - | 86 | /* Something's gone properly pear shaped - |
87 | * we couldn't even find the entry */ | 87 | * we couldn't even find the entry */ |
88 | rb->splash(HZ*2, "File/Dir not found: %s", parameter); | 88 | rb->splashf(HZ*2, "File/Dir not found: %s", parameter); |
89 | return PLUGIN_ERROR; | 89 | return PLUGIN_ERROR; |
90 | } | 90 | } |
91 | 91 | ||
diff --git a/apps/plugins/shortcuts/shortcuts_common.c b/apps/plugins/shortcuts/shortcuts_common.c index 231c72df09..0ea18c06a2 100644 --- a/apps/plugins/shortcuts/shortcuts_common.c +++ b/apps/plugins/shortcuts/shortcuts_common.c | |||
@@ -90,7 +90,7 @@ bool load_sc_file(sc_file_t *file, char *filename, bool must_exist, | |||
90 | if (fd < 0){ | 90 | if (fd < 0){ |
91 | /* For some reason we couldn't create the file, | 91 | /* For some reason we couldn't create the file, |
92 | * so return an error message and exit */ | 92 | * so return an error message and exit */ |
93 | rb->splash(HZ*2, "Couldn't create the shortcuts file %s", | 93 | rb->splashf(HZ*2, "Couldn't create the shortcuts file %s", |
94 | filename); | 94 | filename); |
95 | goto end_of_proc; | 95 | goto end_of_proc; |
96 | } | 96 | } |
@@ -98,7 +98,7 @@ bool load_sc_file(sc_file_t *file, char *filename, bool must_exist, | |||
98 | ret_val = true; | 98 | ret_val = true; |
99 | goto end_of_proc; | 99 | goto end_of_proc; |
100 | } else { | 100 | } else { |
101 | rb->splash(HZ, "Couldn't open %s", filename); | 101 | rb->splashf(HZ, "Couldn't open %s", filename); |
102 | goto end_of_proc; | 102 | goto end_of_proc; |
103 | } | 103 | } |
104 | } | 104 | } |
@@ -108,7 +108,7 @@ bool load_sc_file(sc_file_t *file, char *filename, bool must_exist, | |||
108 | continue; | 108 | continue; |
109 | } | 109 | } |
110 | if (file->entry_cnt >= file->max_entries) { | 110 | if (file->entry_cnt >= file->max_entries) { |
111 | rb->splash(HZ*2, "Too many entries in the file, max allowed: %d", | 111 | rb->splashf(HZ*2, "Too many entries in the file, max allowed: %d", |
112 | file->max_entries); | 112 | file->max_entries); |
113 | goto end_of_proc; | 113 | goto end_of_proc; |
114 | } | 114 | } |
@@ -320,7 +320,7 @@ bool dump_sc_file(sc_file_t *file, char *filename) | |||
320 | * thing. */ | 320 | * thing. */ |
321 | fd = rb->open(filename, O_WRONLY|O_TRUNC); | 321 | fd = rb->open(filename, O_WRONLY|O_TRUNC); |
322 | if (fd < 0) { | 322 | if (fd < 0) { |
323 | rb->splash(HZ*2, "Could not open shortcuts file %s for writing", | 323 | rb->splashf(HZ*2, "Could not open shortcuts file %s for writing", |
324 | filename); | 324 | filename); |
325 | return false; | 325 | return false; |
326 | } | 326 | } |
diff --git a/apps/plugins/shortcuts/shortcuts_view.c b/apps/plugins/shortcuts/shortcuts_view.c index e6b89b7641..09b25480e8 100644 --- a/apps/plugins/shortcuts/shortcuts_view.c +++ b/apps/plugins/shortcuts/shortcuts_view.c | |||
@@ -149,7 +149,7 @@ bool list_sc(bool is_editable) | |||
149 | case SCLA_SELECT: | 149 | case SCLA_SELECT: |
150 | return goto_entry(sc_file.entries[selected_item].path); | 150 | return goto_entry(sc_file.entries[selected_item].path); |
151 | case SCLA_DELETE: | 151 | case SCLA_DELETE: |
152 | rb->splash(HZ, "Deleting %s", sc_file.entries[selected_item].disp); | 152 | rb->splashf(HZ, "Deleting %s", sc_file.entries[selected_item].disp); |
153 | remove_entry(&sc_file, selected_item); | 153 | remove_entry(&sc_file, selected_item); |
154 | dump_sc_file(&sc_file, link_filename); | 154 | dump_sc_file(&sc_file, link_filename); |
155 | return (sc_file.entry_cnt == 0); | 155 | return (sc_file.entry_cnt == 0); |
@@ -175,7 +175,7 @@ bool goto_entry(char *file_or_dir) | |||
175 | } | 175 | } |
176 | 176 | ||
177 | if (!exists) { | 177 | if (!exists) { |
178 | rb->splash(HZ*2, "%s %s no longer exists on disk", what, file_or_dir); | 178 | rb->splashf(HZ*2, "%s %s no longer exists on disk", what, file_or_dir); |
179 | return false; | 179 | return false; |
180 | } | 180 | } |
181 | /* Set the browsers dirfilter to the global setting | 181 | /* Set the browsers dirfilter to the global setting |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 77813a5104..4e8263aadf 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -618,7 +618,7 @@ static bool read_levels(bool initialize) | |||
618 | buffered_boards.start = 0; | 618 | buffered_boards.start = 0; |
619 | 619 | ||
620 | if ((fd = rb->open(buffered_boards.filename, O_RDONLY)) < 0) { | 620 | if ((fd = rb->open(buffered_boards.filename, O_RDONLY)) < 0) { |
621 | rb->splash(HZ*2, "Unable to open %s", buffered_boards.filename); | 621 | rb->splashf(HZ*2, "Unable to open %s", buffered_boards.filename); |
622 | return false; | 622 | return false; |
623 | } | 623 | } |
624 | 624 | ||
@@ -930,7 +930,7 @@ static bool save(char *filename, bool solution) | |||
930 | 930 | ||
931 | if (filename[0] == '\0' || | 931 | if (filename[0] == '\0' || |
932 | (fd = rb->open(filename, O_WRONLY|O_CREAT|O_TRUNC)) < 0) { | 932 | (fd = rb->open(filename, O_WRONLY|O_CREAT|O_TRUNC)) < 0) { |
933 | rb->splash(HZ*2, "Unable to open %s", filename); | 933 | rb->splashf(HZ*2, "Unable to open %s", filename); |
934 | return false; | 934 | return false; |
935 | } | 935 | } |
936 | 936 | ||
@@ -965,7 +965,7 @@ static bool load(char *filename, bool silent) | |||
965 | 965 | ||
966 | if (filename[0] == '\0' || (fd = rb->open(filename, O_RDONLY)) < 0) { | 966 | if (filename[0] == '\0' || (fd = rb->open(filename, O_RDONLY)) < 0) { |
967 | if (!silent) | 967 | if (!silent) |
968 | rb->splash(HZ*2, "Unable to open %s", filename); | 968 | rb->splashf(HZ*2, "Unable to open %s", filename); |
969 | return false; | 969 | return false; |
970 | } | 970 | } |
971 | 971 | ||
diff --git a/apps/plugins/sort.c b/apps/plugins/sort.c index a313bb1bd6..5292400b0f 100644 --- a/apps/plugins/sort.c +++ b/apps/plugins/sort.c | |||
@@ -207,7 +207,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
207 | rc = write_file(); | 207 | rc = write_file(); |
208 | if(rc < 0) { | 208 | if(rc < 0) { |
209 | rb->lcd_clear_display(); | 209 | rb->lcd_clear_display(); |
210 | rb->splash(HZ, "Can't write file: %d", rc); | 210 | rb->splashf(HZ, "Can't write file: %d", rc); |
211 | } else { | 211 | } else { |
212 | rb->lcd_clear_display(); | 212 | rb->lcd_clear_display(); |
213 | rb->splash(HZ, "Done"); | 213 | rb->splash(HZ, "Done"); |
@@ -215,7 +215,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
215 | } else { | 215 | } else { |
216 | if(rc < 0) { | 216 | if(rc < 0) { |
217 | rb->lcd_clear_display(); | 217 | rb->lcd_clear_display(); |
218 | rb->splash(HZ, "Can't read file: %d", rc); | 218 | rb->splashf(HZ, "Can't read file: %d", rc); |
219 | } else { | 219 | } else { |
220 | rb->lcd_clear_display(); | 220 | rb->lcd_clear_display(); |
221 | rb->splash(HZ, "The file is too big"); | 221 | rb->splash(HZ, "The file is too big"); |
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index 4f319b4bef..8de6a746ab 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c | |||
@@ -690,7 +690,7 @@ static int save( | |||
690 | 690 | ||
691 | if (close_stat != 0) | 691 | if (close_stat != 0) |
692 | { | 692 | { |
693 | rb->splash(0, "failed closing file1: error %d", close_stat); | 693 | rb->splashf(0, "failed closing file1: error %d", close_stat); |
694 | rb->button_get(true); | 694 | rb->button_get(true); |
695 | rb->button_get(true); | 695 | rb->button_get(true); |
696 | } else { | 696 | } else { |
@@ -702,7 +702,7 @@ static int save( | |||
702 | } | 702 | } |
703 | else | 703 | else |
704 | { | 704 | { |
705 | rb->splash(0, "Can't write File1: error %d", file1); | 705 | rb->splashf(0, "Can't write File1: error %d", file1); |
706 | rb->button_get(true); | 706 | rb->button_get(true); |
707 | rb->button_get(true); | 707 | rb->button_get(true); |
708 | retval = -1; | 708 | retval = -1; |
@@ -713,7 +713,7 @@ static int save( | |||
713 | { | 713 | { |
714 | if (rb->lseek(src_file, end, SEEK_SET) < (off_t)end) | 714 | if (rb->lseek(src_file, end, SEEK_SET) < (off_t)end) |
715 | { | 715 | { |
716 | rb->splash(0, "Src file to short: error %d", src_file); | 716 | rb->splashf(0, "Src file to short: error %d", src_file); |
717 | rb->button_get(true); | 717 | rb->button_get(true); |
718 | rb->button_get(true); | 718 | rb->button_get(true); |
719 | } | 719 | } |
@@ -731,7 +731,7 @@ static int save( | |||
731 | 731 | ||
732 | if (close_stat != 0) | 732 | if (close_stat != 0) |
733 | { | 733 | { |
734 | rb->splash(0, "failed: closing file2: error %d", | 734 | rb->splashf(0, "failed: closing file2: error %d", |
735 | close_stat); | 735 | close_stat); |
736 | rb->button_get(true); | 736 | rb->button_get(true); |
737 | rb->button_get(true); | 737 | rb->button_get(true); |
@@ -744,7 +744,7 @@ static int save( | |||
744 | } | 744 | } |
745 | else | 745 | else |
746 | { | 746 | { |
747 | rb->splash(0, "Can't write File2: error %d", file2); | 747 | rb->splashf(0, "Can't write File2: error %d", file2); |
748 | rb->button_get(true); | 748 | rb->button_get(true); |
749 | rb->button_get(true); | 749 | rb->button_get(true); |
750 | retval = -2; | 750 | retval = -2; |
@@ -754,7 +754,7 @@ static int save( | |||
754 | close_stat = rb->close(src_file); | 754 | close_stat = rb->close(src_file); |
755 | if (close_stat != 0) | 755 | if (close_stat != 0) |
756 | { | 756 | { |
757 | rb->splash(0, "failed: closing src: error %d", close_stat); | 757 | rb->splashf(0, "failed: closing src: error %d", close_stat); |
758 | rb->button_get(true); | 758 | rb->button_get(true); |
759 | rb->button_get(true); | 759 | rb->button_get(true); |
760 | } | 760 | } |
diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c index e00328d148..6910c6c7e2 100644 --- a/apps/plugins/text_editor.c +++ b/apps/plugins/text_editor.c | |||
@@ -350,7 +350,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
350 | fd = rb->open(filename,O_RDONLY); | 350 | fd = rb->open(filename,O_RDONLY); |
351 | if (fd<0) | 351 | if (fd<0) |
352 | { | 352 | { |
353 | rb->splash(HZ*2,"Couldnt open file: %s",(char*)parameter); | 353 | rb->splashf(HZ*2,"Couldnt open file: %s",(char*)parameter); |
354 | return PLUGIN_ERROR; | 354 | return PLUGIN_ERROR; |
355 | } | 355 | } |
356 | #ifdef HAVE_LCD_COLOR | 356 | #ifdef HAVE_LCD_COLOR |
@@ -363,7 +363,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
363 | { | 363 | { |
364 | if (!do_action(ACTION_INSERT,temp_line,line_count)) | 364 | if (!do_action(ACTION_INSERT,temp_line,line_count)) |
365 | { | 365 | { |
366 | rb->splash(HZ*2,"Error reading file: %s",(char*)parameter); | 366 | rb->splashf(HZ*2,"Error reading file: %s",(char*)parameter); |
367 | rb->close(fd); | 367 | rb->close(fd); |
368 | return PLUGIN_ERROR; | 368 | return PLUGIN_ERROR; |
369 | } | 369 | } |
diff --git a/apps/plugins/vbrfix.c b/apps/plugins/vbrfix.c index fa05463d13..8313994e29 100644 --- a/apps/plugins/vbrfix.c +++ b/apps/plugins/vbrfix.c | |||
@@ -119,7 +119,7 @@ static int insert_data_in_file(const char *fname, int fpos, char *buf, int num_b | |||
119 | 119 | ||
120 | static void fileerror(int rc) | 120 | static void fileerror(int rc) |
121 | { | 121 | { |
122 | rb->splash(HZ*2, "File error: %d", rc); | 122 | rb->splashf(HZ*2, "File error: %d", rc); |
123 | } | 123 | } |
124 | 124 | ||
125 | static const unsigned char empty_id3_header[] = | 125 | static const unsigned char empty_id3_header[] = |
diff --git a/apps/plugins/wavplay.c b/apps/plugins/wavplay.c index 0a1136a6c2..333d16135c 100644 --- a/apps/plugins/wavplay.c +++ b/apps/plugins/wavplay.c | |||
@@ -3500,7 +3500,7 @@ int play_file(char* filename) | |||
3500 | format = letoh16(*(uint16_t *)(aud_buf + 20)); | 3500 | format = letoh16(*(uint16_t *)(aud_buf + 20)); |
3501 | if (format != 1) | 3501 | if (format != 1) |
3502 | { | 3502 | { |
3503 | rb->splash(2*HZ, "Unsupported format: %d", format); | 3503 | rb->splashf(2*HZ, "Unsupported format: %d", format); |
3504 | rb->close(fd); | 3504 | rb->close(fd); |
3505 | return PLAY_ERROR; | 3505 | return PLAY_ERROR; |
3506 | } | 3506 | } |
@@ -3508,7 +3508,7 @@ int play_file(char* filename) | |||
3508 | channels = letoh16(*(uint16_t *)(aud_buf + 22)); | 3508 | channels = letoh16(*(uint16_t *)(aud_buf + 22)); |
3509 | if (channels > 2) | 3509 | if (channels > 2) |
3510 | { | 3510 | { |
3511 | rb->splash(2*HZ, "Too many channels: %d", channels); | 3511 | rb->splashf(2*HZ, "Too many channels: %d", channels); |
3512 | rb->close(fd); | 3512 | rb->close(fd); |
3513 | return PLAY_ERROR; | 3513 | return PLAY_ERROR; |
3514 | } | 3514 | } |
@@ -3516,7 +3516,7 @@ int play_file(char* filename) | |||
3516 | samplebits = letoh16(*(uint16_t *)(aud_buf + 34)); | 3516 | samplebits = letoh16(*(uint16_t *)(aud_buf + 34)); |
3517 | if (samplebits != 16) | 3517 | if (samplebits != 16) |
3518 | { | 3518 | { |
3519 | rb->splash(2*HZ, "Unsupported sample depth: %dbit", samplebits); | 3519 | rb->splashf(2*HZ, "Unsupported sample depth: %dbit", samplebits); |
3520 | rb->close(fd); | 3520 | rb->close(fd); |
3521 | return PLAY_ERROR; | 3521 | return PLAY_ERROR; |
3522 | } | 3522 | } |
@@ -3534,7 +3534,7 @@ int play_file(char* filename) | |||
3534 | case 44100: rate = 9; break; | 3534 | case 44100: rate = 9; break; |
3535 | case 48000: rate = 10; break; | 3535 | case 48000: rate = 10; break; |
3536 | default: | 3536 | default: |
3537 | rb->splash(2*HZ, "Unsupported samplerate: %dHz", samplerate); | 3537 | rb->splashf(2*HZ, "Unsupported samplerate: %dHz", samplerate); |
3538 | rb->close(fd); | 3538 | rb->close(fd); |
3539 | return PLAY_ERROR; | 3539 | return PLAY_ERROR; |
3540 | } | 3540 | } |
diff --git a/apps/plugins/wavrecord.c b/apps/plugins/wavrecord.c index 5c7a987171..d57a61a6a2 100644 --- a/apps/plugins/wavrecord.c +++ b/apps/plugins/wavrecord.c | |||
@@ -3772,7 +3772,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
3772 | rc = rb->mkdir(recbasedir); | 3772 | rc = rb->mkdir(recbasedir); |
3773 | if (rc < 0) | 3773 | if (rc < 0) |
3774 | { | 3774 | { |
3775 | rb->splash(HZ*2, "Can't create directory %s. Error %d.", | 3775 | rb->splashf(HZ*2, "Can't create directory %s. Error %d.", |
3776 | recbasedir, rc); | 3776 | recbasedir, rc); |
3777 | return PLUGIN_ERROR; | 3777 | return PLUGIN_ERROR; |
3778 | } | 3778 | } |
diff --git a/apps/plugins/wavview.c b/apps/plugins/wavview.c index 0d7b6f6476..7a26a3911f 100644 --- a/apps/plugins/wavview.c +++ b/apps/plugins/wavview.c | |||
@@ -203,7 +203,7 @@ static int readwavpeaks(const char *filename) | |||
203 | } | 203 | } |
204 | if(((bytes_read/4)*4) != bytes_read) | 204 | if(((bytes_read/4)*4) != bytes_read) |
205 | { | 205 | { |
206 | rb->splash(HZ*2, "bytes_read/*4 err: %ld",(long int)bytes_read); | 206 | rb->splashf(HZ*2, "bytes_read/*4 err: %ld",(long int)bytes_read); |
207 | rb->close (file); | 207 | rb->close (file); |
208 | return -1; | 208 | return -1; |
209 | } | 209 | } |
@@ -438,12 +438,12 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void *parame | |||
438 | /* zoom out */ | 438 | /* zoom out */ |
439 | if(zoomlevel > 1) | 439 | if(zoomlevel > 1) |
440 | zoomlevel /= 2; | 440 | zoomlevel /= 2; |
441 | rb->splash(HZ/2, "ZOOM: %dx",(int)zoomlevel); | 441 | rb->splashf(HZ/2, "ZOOM: %dx",(int)zoomlevel); |
442 | break; | 442 | break; |
443 | case ACTION_KBD_DOWN: | 443 | case ACTION_KBD_DOWN: |
444 | if(zoomlevel < (mempeakcount / LCD_WIDTH / 2)) | 444 | if(zoomlevel < (mempeakcount / LCD_WIDTH / 2)) |
445 | zoomlevel *= 2; | 445 | zoomlevel *= 2; |
446 | rb->splash(HZ/2, "ZOOM: %dx",(int)zoomlevel); | 446 | rb->splashf(HZ/2, "ZOOM: %dx",(int)zoomlevel); |
447 | break; | 447 | break; |
448 | case ACTION_KBD_LEFT: | 448 | case ACTION_KBD_LEFT: |
449 | center -= 10 * (mempeakcount / LCD_WIDTH) / zoomlevel; | 449 | center -= 10 * (mempeakcount / LCD_WIDTH) / zoomlevel; |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index dc730292de..0faf8a27be 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -845,7 +845,7 @@ static inline void move_board (void) | |||
845 | player.j = newj; | 845 | player.j = newj; |
846 | } | 846 | } |
847 | if (percentage_cache >= difficulty) { /* finished level */ | 847 | if (percentage_cache >= difficulty) { /* finished level */ |
848 | rb->splash (HZ * 2, "Level %d finished", player.level+1); | 848 | rb->splashf (HZ * 2, "Level %d finished", player.level+1); |
849 | player.score += percentage_cache; | 849 | player.score += percentage_cache; |
850 | if (player.level < MAX_LEVEL) | 850 | if (player.level < MAX_LEVEL) |
851 | player.level++; | 851 | player.level++; |
diff --git a/apps/plugins/zxbox/snapshot.c b/apps/plugins/zxbox/snapshot.c index 0010550392..d078ec78b1 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, "Could not open snapshot file `%s'",filenamebuf); | 654 | rb->splashf(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 136dcf0f24..6c586566f9 100644 --- a/apps/plugins/zxbox/spmain.c +++ b/apps/plugins/zxbox/spmain.c | |||
@@ -532,7 +532,7 @@ static void init_load(const void *parameter) | |||
532 | check_params(parameter); | 532 | check_params(parameter); |
533 | if(spcf_init_snapshot != NULL) { | 533 | if(spcf_init_snapshot != NULL) { |
534 | #ifndef USE_GREY | 534 | #ifndef USE_GREY |
535 | rb->splash(HZ, "Loading snapshot '%s'", spcf_init_snapshot); | 535 | rb->splashf(HZ, "Loading snapshot '%s'", spcf_init_snapshot); |
536 | #endif | 536 | #endif |
537 | 537 | ||
538 | load_snapshot_file_type(spcf_init_snapshot, spcf_init_snapshot_type); | 538 | load_snapshot_file_type(spcf_init_snapshot, spcf_init_snapshot_type); |