diff options
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 97aef29..be94036 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, case BUBBLES_START: /* pause the game */ start = *rb->current_tick; - rb->splash(1, "Paused"); + rb->splash(0, "Paused"); while(pluginlib_getaction(rb,TIMEOUT_BLOCK,plugin_contexts,2) != (BUBBLES_START)); bb->startedshot += *rb->current_tick-start; diff --git a/apps/plugins/iriverify.c b/apps/plugins/iriverify.c index c88ddc7..7e77ae3 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 FOR_NB_SCREENS(i) rb->screens[i]->clear_display(); if(rc < 0) { - rb->splash(HZ, "Can't write file: %d", rc); + rb->splashf(HZ, "Can't write file: %d", rc); } else { rb->splash(HZ, "Done"); } } else { if(rc < 0) { - rb->splash(HZ, "Can't read file: %d", rc); + rb->splashf(HZ, "Can't read file: %d", rc); } else { rb->splash(HZ, "The file is too big"); } diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 48735a2..7f4cd4b 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -1261,7 +1261,7 @@ static void jewels_nextlevel(struct game_context* bj) { while(bj->score >= LEVEL_PTS) { bj->score -= LEVEL_PTS; bj->level++; - rb->splash(HZ*2, "Level %d", bj->level); + rb->splashf(HZ*2, "Level %d", bj->level); jewels_drawboard(bj); } @@ -1283,7 +1283,7 @@ static void jewels_nextlevel(struct game_context* bj) { rb->splash(HZ*2, "You win!"); bj->level = 1; } else { - rb->splash(HZ*2, "Level %d", bj->level); + rb->splashf(HZ*2, "Level %d", bj->level); } break; } diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index a17c6d7..ffc9d49 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) #endif if (status) { - rb->splash(HZ, "decode error %d", status); + rb->splashf(HZ, "decode error %d", status); file_pt[curfile] = '\0'; return NULL; } @@ -3212,7 +3212,7 @@ int load_and_show(char* filename) if (status < 0 || (status & (DQT | SOF0)) != (DQT | SOF0)) { /* bad format or minimum components not contained */ - rb->splash(HZ, "unsupported %d", status); + rb->splashf(HZ, "unsupported %d", status); file_pt[curfile] = '\0'; return change_filename(direction); } diff --git a/apps/plugins/keybox.c b/apps/plugins/keybox.c index 389299d..fef3d4f 100644 --- a/apps/plugins/keybox.c +++ b/apps/plugins/keybox.c @@ -312,9 +312,9 @@ static void splash_pw(int selected_item) entry = entry->next; } if (entry->name != '\0') - rb->splash(0, "%s %s", entry->name, entry->password); + rb->splashf(0, "%s %s", entry->name, entry->password); else - rb->splash(0, "%s", entry->password); + rb->splashf(0, "%s", entry->password); rb->get_action(CONTEXT_STD, TIMEOUT_BLOCK); } diff --git a/apps/plugins/lib/overlay.c b/apps/plugins/lib/overlay.c index a779722..706d6c1 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 fd = rb->open(filename, O_RDONLY); if (fd < 0) { - rb->splash(2*HZ, "Can't open %s", filename); + rb->splashf(2*HZ, "Can't open %s", filename); return PLUGIN_ERROR; } readsize = rb->read(fd, &header, sizeof(header)); @@ -67,17 +67,17 @@ enum plugin_status run_overlay(const struct plugin_api* rb, const void* paramete if (readsize != sizeof(header)) { - rb->splash(2*HZ, "Reading %s overlay failed.", name); + rb->splashf(2*HZ, "Reading %s overlay failed.", name); return PLUGIN_ERROR; } if (header.magic != PLUGIN_MAGIC || header.target_id != TARGET_ID) { - rb->splash(2*HZ, "%s overlay: Incompatible model.", name); + rb->splashf(2*HZ, "%s overlay: Incompatible model.", name); return PLUGIN_ERROR; } if (header.api_version != PLUGIN_API_VERSION) { - rb->splash(2*HZ, "%s overlay: Incompatible version.", name); + rb->splashf(2*HZ, "%s overlay: Incompatible version.", name); return PLUGIN_ERROR; } @@ -85,14 +85,14 @@ enum plugin_status run_overlay(const struct plugin_api* rb, const void* paramete if (header.load_addr < audiobuf || header.end_addr > audiobuf + audiobuf_size) { - rb->splash(2*HZ, "%s overlay doesn't fit into memory.", name); + rb->splashf(2*HZ, "%s overlay doesn't fit into memory.", name); return PLUGIN_ERROR; } fd = rb->open(filename, O_RDONLY); if (fd < 0) { - rb->splash(2*HZ, "Can't open %s", filename); + rb->splashf(2*HZ, "Can't open %s", filename); return PLUGIN_ERROR; } 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 if (readsize < 0) { - rb->splash(2*HZ, "Reading %s overlay failed.", name); + rb->splashf(2*HZ, "Reading %s overlay failed.", name); return PLUGIN_ERROR; } /* Zero out bss area */ diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c index 1868601..c1726a5 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) */ rb->lcd_remote_clear_display(); #endif - rb->splash(MAZEZAM_DELAY_LIVES, MAZEZAM_TEXT_LIVES, + rb->splashf(MAZEZAM_DELAY_LIVES, MAZEZAM_TEXT_LIVES, level+1, lives); /* ensure keys pressed during the splash screen are ignored */ diff --git a/apps/plugins/md5sum.c b/apps/plugins/md5sum.c index 084256b..f95cd20 100644 --- a/apps/plugins/md5sum.c +++ b/apps/plugins/md5sum.c @@ -58,7 +58,7 @@ static void hash_file( int out, const char *path ) { char string[MD5_STRING_LENGTH+1]; done++; - rb->splash( 0, "%d / %d : %s", done, count, path ); + rb->splashf( 0, "%d / %d : %s", done, count, path ); if( hash( string, path ) ) rb->write( out, "error", 5 ); else @@ -140,7 +140,7 @@ static void hash_check( int out, const char *path ) { const char *filename = rb->strchr( line, ' ' ); done++; - rb->splash( 0, "%d / %d : %s", done, count, filename ); + rb->splashf( 0, "%d / %d : %s", done, count, filename ); if( !filename || len < MD5_STRING_LENGTH + 2 ) { const char error[] = "Malformed input line ... skipping"; diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 16cc0fc..266d12f 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c @@ -749,12 +749,12 @@ enum minesweeper_status minesweeper( void ) break; flags_used = count_flags(); if (flags_used == 1) { - rb->splash( HZ*2, "You marked 1 field. There are %d mines.", + rb->splashf( HZ*2, "You marked 1 field. There are %d mines.", mine_num ); } else { - rb->splash( HZ*2, "You marked %d fields. There are %d mines.", + rb->splashf( HZ*2, "You marked %d fields. There are %d mines.", flags_used, mine_num ); } break; diff --git a/apps/plugins/mpegplayer/disk_buf.c b/apps/plugins/mpegplayer/disk_buf.c index f37797b..7ba4025 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) wm : AVERAGE(disk_buf.low_wm, wm, 16); #if 0 - rb->splash(0, "*%10ld %10ld", disk_buf.low_wm, + rb->splashf(0, "*%10ld %10ld", disk_buf.low_wm, disk_buf.win_right - sw.right); #endif diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index c775a14..c58a2f6 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 errstring = "Error opening file: %d"; } - rb->splash(HZ*2, errstring, err); + rb->splashf(HZ*2, errstring, err); } } diff --git a/apps/plugins/pacbox/pacbox.c b/apps/plugins/pacbox/pacbox.c index 16860f9..c4ee037 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 SETTINGS_VERSION); } } else { - rb->splash(HZ*2, "No ROMs in %s/pacman/", ROCKBOX_DIR); + rb->splashf(HZ*2, "No ROMs in %s/pacman/", ROCKBOX_DIR); } #ifdef HAVE_ADJUSTABLE_CPU_FREQ diff --git a/apps/plugins/ppmviewer.c b/apps/plugins/ppmviewer.c index 4c24a5d..01513c4 100644 --- a/apps/plugins/ppmviewer.c +++ b/apps/plugins/ppmviewer.c @@ -36,7 +36,7 @@ PLUGIN_HEADER #define PPM_OVERALLMAXVAL 65535 #define PPM_MAXSIZE (300*1024)/sizeof(fb_data) -#define ppm_error(...) rb->splash(HZ*2, __VA_ARGS__ ) +#define ppm_error(...) rb->splashf(HZ*2, __VA_ARGS__ ) static fb_data buffer[PPM_MAXSIZE]; static fb_data lcd_buf[LCD_WIDTH * LCD_HEIGHT]; diff --git a/apps/plugins/properties.c b/apps/plugins/properties.c index 86955a7..22288d4 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 if(!found) { /* weird: we couldn't find the entry. This Should Never Happen (TM) */ - rb->splash(0, "File/Dir not found: %s", file); + rb->splashf(0, "File/Dir not found: %s", file); rb->action_userabort(TIMEOUT_BLOCK); return PLUGIN_OK; } diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c index c03a794..3df3808 100644 --- a/apps/plugins/random_folder_advance_config.c +++ b/apps/plugins/random_folder_advance_config.c @@ -219,7 +219,7 @@ void generate(void) rb->write(fd,&dirs_count,sizeof(int)); if (fd < 0) { - rb->splash(HZ, "Couldnt open %s", RFA_FILE); + rb->splashf(HZ, "Couldnt open %s", RFA_FILE); return; } #ifndef HAVE_LCD_CHARCELLS @@ -295,7 +295,7 @@ int edit_list(void) /* load the dat file if not already done */ if ((list == NULL || list->count == 0) && (i = load_list()) != 0) { - rb->splash(HZ*2, "Could not load %s, rv = %d", RFA_FILE, i); + rb->splashf(HZ*2, "Could not load %s, rv = %d", RFA_FILE, i); return -1; } @@ -387,13 +387,13 @@ int export_list_to_file_text(void) /* load the dat file if not already done */ if ((list == NULL || list->count == 0) && (i = load_list()) != 0) { - rb->splash(HZ*2, "Could not load %s, rv = %d", RFA_FILE, i); + rb->splashf(HZ*2, "Could not load %s, rv = %d", RFA_FILE, i); return 0; } if (list->count <= 0) { - rb->splash(HZ*2, "no dirs in list file: %s", RFA_FILE); + rb->splashf(HZ*2, "no dirs in list file: %s", RFA_FILE); return 0; } @@ -401,7 +401,7 @@ int export_list_to_file_text(void) int myfd = rb->creat(RFA_FILE_TEXT); if (myfd < 0) { - rb->splash(HZ*4, "failed to open: fd = %d, file = %s", + rb->splashf(HZ*4, "failed to open: fd = %d, file = %s", myfd, RFA_FILE_TEXT); return -1; } @@ -434,7 +434,7 @@ int import_list_from_file_text(void) int myfd = rb->open(RFA_FILE_TEXT, O_RDONLY); if (myfd < 0) { - rb->splash(HZ*2, "failed to open: %s", RFA_FILE_TEXT); + rb->splashf(HZ*2, "failed to open: %s", RFA_FILE_TEXT); return -1; } diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index c4e6328..6436d9b 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -2520,12 +2520,12 @@ static void goto_menu(void) { if( load_bitmap( filename ) <= 0 ) { - rb->splash( 1*HZ, "Error while loading %s", + rb->splashf( 1*HZ, "Error while loading %s", filename ); } else { - rb->splash( 1*HZ, "Image loaded (%s)", filename ); + rb->splashf( 1*HZ, "Image loaded (%s)", filename ); restore_screen(); inv_cursor(true); return; @@ -2542,7 +2542,7 @@ static void goto_menu(void) rb->strcasecmp(&filename[rb->strlen(filename)-4], ".bmp")) rb->strcat(filename, ".bmp"); save_bitmap( filename ); - rb->splash( 1*HZ, "File saved (%s)", filename ); + rb->splashf( 1*HZ, "File saved (%s)", filename ); } break; @@ -3011,7 +3011,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame } else { - rb->splash( 1*HZ, "Image loaded (%s)", (char *)parameter ); + rb->splashf( 1*HZ, "Image loaded (%s)", (char *)parameter ); restore_screen(); rb->strcpy( filename, parameter ); } diff --git a/apps/plugins/shortcuts/shortcuts_append.c b/apps/plugins/shortcuts/shortcuts_append.c index 0e73d2c..0d74767 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 if (!found) { /* Something's gone properly pear shaped - * we couldn't even find the entry */ - rb->splash(HZ*2, "File/Dir not found: %s", parameter); + rb->splashf(HZ*2, "File/Dir not found: %s", parameter); return PLUGIN_ERROR; } diff --git a/apps/plugins/shortcuts/shortcuts_common.c b/apps/plugins/shortcuts/shortcuts_common.c index 231c72d..0ea18c0 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, if (fd < 0){ /* For some reason we couldn't create the file, * so return an error message and exit */ - rb->splash(HZ*2, "Couldn't create the shortcuts file %s", + rb->splashf(HZ*2, "Couldn't create the shortcuts file %s", filename); goto end_of_proc; } @@ -98,7 +98,7 @@ bool load_sc_file(sc_file_t *file, char *filename, bool must_exist, ret_val = true; goto end_of_proc; } else { - rb->splash(HZ, "Couldn't open %s", filename); + rb->splashf(HZ, "Couldn't open %s", filename); goto end_of_proc; } } @@ -108,7 +108,7 @@ bool load_sc_file(sc_file_t *file, char *filename, bool must_exist, continue; } if (file->entry_cnt >= file->max_entries) { - rb->splash(HZ*2, "Too many entries in the file, max allowed: %d", + rb->splashf(HZ*2, "Too many entries in the file, max allowed: %d", file->max_entries); goto end_of_proc; } @@ -320,7 +320,7 @@ bool dump_sc_file(sc_file_t *file, char *filename) * thing. */ fd = rb->open(filename, O_WRONLY|O_TRUNC); if (fd < 0) { - rb->splash(HZ*2, "Could not open shortcuts file %s for writing", + rb->splashf(HZ*2, "Could not open shortcuts file %s for writing", filename); return false; } diff --git a/apps/plugins/shortcuts/shortcuts_view.c b/apps/plugins/shortcuts/shortcuts_view.c index e6b89b7..09b2548 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) case SCLA_SELECT: return goto_entry(sc_file.entries[selected_item].path); case SCLA_DELETE: - rb->splash(HZ, "Deleting %s", sc_file.entries[selected_item].disp); + rb->splashf(HZ, "Deleting %s", sc_file.entries[selected_item].disp); remove_entry(&sc_file, selected_item); dump_sc_file(&sc_file, link_filename); return (sc_file.entry_cnt == 0); @@ -175,7 +175,7 @@ bool goto_entry(char *file_or_dir) } if (!exists) { - rb->splash(HZ*2, "%s %s no longer exists on disk", what, file_or_dir); + rb->splashf(HZ*2, "%s %s no longer exists on disk", what, file_or_dir); return false; } /* Set the browsers dirfilter to the global setting diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 77813a5..4e8263a 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -618,7 +618,7 @@ static bool read_levels(bool initialize) buffered_boards.start = 0; if ((fd = rb->open(buffered_boards.filename, O_RDONLY)) < 0) { - rb->splash(HZ*2, "Unable to open %s", buffered_boards.filename); + rb->splashf(HZ*2, "Unable to open %s", buffered_boards.filename); return false; } @@ -930,7 +930,7 @@ static bool save(char *filename, bool solution) if (filename[0] == '\0' || (fd = rb->open(filename, O_WRONLY|O_CREAT|O_TRUNC)) < 0) { - rb->splash(HZ*2, "Unable to open %s", filename); + rb->splashf(HZ*2, "Unable to open %s", filename); return false; } @@ -965,7 +965,7 @@ static bool load(char *filename, bool silent) if (filename[0] == '\0' || (fd = rb->open(filename, O_RDONLY)) < 0) { if (!silent) - rb->splash(HZ*2, "Unable to open %s", filename); + rb->splashf(HZ*2, "Unable to open %s", filename); return false; } diff --git a/apps/plugins/sort.c b/apps/plugins/sort.c index a313bb1..5292400 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 rc = write_file(); if(rc < 0) { rb->lcd_clear_display(); - rb->splash(HZ, "Can't write file: %d", rc); + rb->splashf(HZ, "Can't write file: %d", rc); } else { rb->lcd_clear_display(); rb->splash(HZ, "Done"); @@ -215,7 +215,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame } else { if(rc < 0) { rb->lcd_clear_display(); - rb->splash(HZ, "Can't read file: %d", rc); + rb->splashf(HZ, "Can't read file: %d", rc); } else { rb->lcd_clear_display(); rb->splash(HZ, "The file is too big"); diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index 4f319b4..8de6a74 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c @@ -690,7 +690,7 @@ static int save( if (close_stat != 0) { - rb->splash(0, "failed closing file1: error %d", close_stat); + rb->splashf(0, "failed closing file1: error %d", close_stat); rb->button_get(true); rb->button_get(true); } else { @@ -702,7 +702,7 @@ static int save( } else { - rb->splash(0, "Can't write File1: error %d", file1); + rb->splashf(0, "Can't write File1: error %d", file1); rb->button_get(true); rb->button_get(true); retval = -1; @@ -713,7 +713,7 @@ static int save( { if (rb->lseek(src_file, end, SEEK_SET) < (off_t)end) { - rb->splash(0, "Src file to short: error %d", src_file); + rb->splashf(0, "Src file to short: error %d", src_file); rb->button_get(true); rb->button_get(true); } @@ -731,7 +731,7 @@ static int save( if (close_stat != 0) { - rb->splash(0, "failed: closing file2: error %d", + rb->splashf(0, "failed: closing file2: error %d", close_stat); rb->button_get(true); rb->button_get(true); @@ -744,7 +744,7 @@ static int save( } else { - rb->splash(0, "Can't write File2: error %d", file2); + rb->splashf(0, "Can't write File2: error %d", file2); rb->button_get(true); rb->button_get(true); retval = -2; @@ -754,7 +754,7 @@ static int save( close_stat = rb->close(src_file); if (close_stat != 0) { - rb->splash(0, "failed: closing src: error %d", close_stat); + rb->splashf(0, "failed: closing src: error %d", close_stat); rb->button_get(true); rb->button_get(true); } diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c index e00328d..6910c6c 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 fd = rb->open(filename,O_RDONLY); if (fd<0) { - rb->splash(HZ*2,"Couldnt open file: %s",(char*)parameter); + rb->splashf(HZ*2,"Couldnt open file: %s",(char*)parameter); return PLUGIN_ERROR; } #ifdef HAVE_LCD_COLOR @@ -363,7 +363,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame { if (!do_action(ACTION_INSERT,temp_line,line_count)) { - rb->splash(HZ*2,"Error reading file: %s",(char*)parameter); + rb->splashf(HZ*2,"Error reading file: %s",(char*)parameter); rb->close(fd); return PLUGIN_ERROR; } diff --git a/apps/plugins/vbrfix.c b/apps/plugins/vbrfix.c index fa05463..8313994 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 static void fileerror(int rc) { - rb->splash(HZ*2, "File error: %d", rc); + rb->splashf(HZ*2, "File error: %d", rc); } static const unsigned char empty_id3_header[] = diff --git a/apps/plugins/wavplay.c b/apps/plugins/wavplay.c index 0a1136a..333d161 100644 --- a/apps/plugins/wavplay.c +++ b/apps/plugins/wavplay.c @@ -3500,7 +3500,7 @@ int play_file(char* filename) format = letoh16(*(uint16_t *)(aud_buf + 20)); if (format != 1) { - rb->splash(2*HZ, "Unsupported format: %d", format); + rb->splashf(2*HZ, "Unsupported format: %d", format); rb->close(fd); return PLAY_ERROR; } @@ -3508,7 +3508,7 @@ int play_file(char* filename) channels = letoh16(*(uint16_t *)(aud_buf + 22)); if (channels > 2) { - rb->splash(2*HZ, "Too many channels: %d", channels); + rb->splashf(2*HZ, "Too many channels: %d", channels); rb->close(fd); return PLAY_ERROR; } @@ -3516,7 +3516,7 @@ int play_file(char* filename) samplebits = letoh16(*(uint16_t *)(aud_buf + 34)); if (samplebits != 16) { - rb->splash(2*HZ, "Unsupported sample depth: %dbit", samplebits); + rb->splashf(2*HZ, "Unsupported sample depth: %dbit", samplebits); rb->close(fd); return PLAY_ERROR; } @@ -3534,7 +3534,7 @@ int play_file(char* filename) case 44100: rate = 9; break; case 48000: rate = 10; break; default: - rb->splash(2*HZ, "Unsupported samplerate: %dHz", samplerate); + rb->splashf(2*HZ, "Unsupported samplerate: %dHz", samplerate); rb->close(fd); return PLAY_ERROR; } diff --git a/apps/plugins/wavrecord.c b/apps/plugins/wavrecord.c index 5c7a987..d57a61a 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 rc = rb->mkdir(recbasedir); if (rc < 0) { - rb->splash(HZ*2, "Can't create directory %s. Error %d.", + rb->splashf(HZ*2, "Can't create directory %s. Error %d.", recbasedir, rc); return PLUGIN_ERROR; } diff --git a/apps/plugins/wavview.c b/apps/plugins/wavview.c index 0d7b6f6..7a26a39 100644 --- a/apps/plugins/wavview.c +++ b/apps/plugins/wavview.c @@ -203,7 +203,7 @@ static int readwavpeaks(const char *filename) } if(((bytes_read/4)*4) != bytes_read) { - rb->splash(HZ*2, "bytes_read/*4 err: %ld",(long int)bytes_read); + rb->splashf(HZ*2, "bytes_read/*4 err: %ld",(long int)bytes_read); rb->close (file); return -1; } @@ -438,12 +438,12 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void *parame /* zoom out */ if(zoomlevel > 1) zoomlevel /= 2; - rb->splash(HZ/2, "ZOOM: %dx",(int)zoomlevel); + rb->splashf(HZ/2, "ZOOM: %dx",(int)zoomlevel); break; case ACTION_KBD_DOWN: if(zoomlevel < (mempeakcount / LCD_WIDTH / 2)) zoomlevel *= 2; - rb->splash(HZ/2, "ZOOM: %dx",(int)zoomlevel); + rb->splashf(HZ/2, "ZOOM: %dx",(int)zoomlevel); break; case ACTION_KBD_LEFT: center -= 10 * (mempeakcount / LCD_WIDTH) / zoomlevel; diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index dc73029..0faf8a2 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c @@ -845,7 +845,7 @@ static inline void move_board (void) player.j = newj; } if (percentage_cache >= difficulty) { /* finished level */ - rb->splash (HZ * 2, "Level %d finished", player.level+1); + rb->splashf (HZ * 2, "Level %d finished", player.level+1); player.score += percentage_cache; if (player.level < MAX_LEVEL) player.level++; diff --git a/apps/plugins/zxbox/snapshot.c b/apps/plugins/zxbox/snapshot.c index 0010550..d078ec7 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) snsh = rb->open(filenamebuf, O_RDONLY); if(snsh < 0) { #ifndef USE_GRAY - rb->splash(HZ, "Could not open snapshot file `%s'",filenamebuf); + rb->splashf(HZ, "Could not open snapshot file `%s'",filenamebuf); #endif return; } diff --git a/apps/plugins/zxbox/spmain.c b/apps/plugins/zxbox/spmain.c index 136dcf0..6c58656 100644 --- a/apps/plugins/zxbox/spmain.c +++ b/apps/plugins/zxbox/spmain.c @@ -532,7 +532,7 @@ static void init_load(const void *parameter) check_params(parameter); if(spcf_init_snapshot != NULL) { #ifndef USE_GREY - rb->splash(HZ, "Loading snapshot '%s'", spcf_init_snapshot); + rb->splashf(HZ, "Loading snapshot '%s'", spcf_init_snapshot); #endif load_snapshot_file_type(spcf_init_snapshot, spcf_init_snapshot_type); |