diff options
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/clock.c | 10 | ||||
| -rw-r--r-- | apps/plugins/favorites.c | 4 | ||||
| -rw-r--r-- | apps/plugins/firmware_flash.c | 14 | ||||
| -rw-r--r-- | apps/plugins/helloworld.c | 2 | ||||
| -rw-r--r-- | apps/plugins/rockbox_flash.c | 12 | ||||
| -rw-r--r-- | apps/plugins/sokoban.c | 4 | ||||
| -rw-r--r-- | apps/plugins/video.c | 2 | ||||
| -rw-r--r-- | apps/plugins/viewer.c | 36 |
8 files changed, 45 insertions, 39 deletions
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c index fa910ef..1df0f70 100644 --- a/apps/plugins/clock.c +++ b/apps/plugins/clock.c @@ -65,7 +65,7 @@ void save_settings(void) } else { - rb->splash(HZ, 0, true, "Setting save failed"); + rb->splash(HZ, true, "Setting save failed"); } } @@ -83,7 +83,7 @@ void load_settings(void) /* Else, loading failed */ else { - rb->splash(HZ, 0, true, "Setting load failed, using default settings."); + rb->splash(HZ, true, "Setting load failed, using default settings."); } } @@ -121,7 +121,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) load_settings(); rb->lcd_clear_display(); - rb->splash(HZ, 0, true, "F1 for INFO"); + rb->splash(HZ, true, "F1 for INFO"); while (!PLUGIN_OK) { @@ -324,11 +324,11 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) /* Tell the user what's going on */ rb->lcd_clear_display(); - rb->splash(HZ/2, 0, true, "Saving settings..."); + rb->splash(HZ/2, true, "Saving settings..."); /* Save to disk */ save_settings(); rb->lcd_clear_display(); - rb->splash(HZ, 0, true, "Saved!"); + rb->splash(HZ, true, "Saved!"); /* ...and exit. */ return PLUGIN_OK; break; diff --git a/apps/plugins/favorites.c b/apps/plugins/favorites.c index 3ee597e..949eeea 100644 --- a/apps/plugins/favorites.c +++ b/apps/plugins/favorites.c @@ -22,7 +22,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) id3 = rb->mpeg_current_track(); if (!id3) { - rb->splash(HZ*2, 0, true, "Nothing To Save"); + rb->splash(HZ*2, true, "Nothing To Save"); return PLUGIN_OK; } @@ -45,7 +45,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) rb->close(fd); } - rb->splash(HZ*2, 0, true, "Saved Favorite"); + rb->splash(HZ*2, true, "Saved Favorite"); return PLUGIN_OK; } diff --git a/apps/plugins/firmware_flash.c b/apps/plugins/firmware_flash.c index c609f5d..c146b34 100644 --- a/apps/plugins/firmware_flash.c +++ b/apps/plugins/firmware_flash.c @@ -611,7 +611,7 @@ void DoUserDialog(char* filename) /* test if the user is running the correct plugin for this box */ if (!CheckPlatform(PLATFORM_ID, *(UINT16*)(FB + VERSION_ADR))) { - rb->splash(HZ*3, 0, true, "Wrong plugin"); + rb->splash(HZ*3, true, "Wrong plugin"); return; /* exit */ } @@ -619,7 +619,7 @@ void DoUserDialog(char* filename) result = CheckBootROM(); if (result == eUnknown) { /* no support for any other yet */ - rb->splash(HZ*3, 0, true, "Wrong boot ROM"); + rb->splash(HZ*3, true, "Wrong boot ROM"); return; /* exit */ } is_romless = (result == eROMless); @@ -640,7 +640,7 @@ void DoUserDialog(char* filename) sector = rb->plugin_get_buffer(&memleft); if (memleft < SEC_SIZE) /* need buffer for a flash sector */ { - rb->splash(HZ*3, 0, true, "Out of memory"); + rb->splash(HZ*3, true, "Out of memory"); return; /* exit */ } @@ -648,7 +648,7 @@ void DoUserDialog(char* filename) ShowFlashInfo(&FlashInfo); if (FlashInfo.size == 0) /* no valid chip */ { - rb->splash(HZ*3, 0, true, "Sorry!"); + rb->splash(HZ*3, true, "Sorry!"); return; /* exit */ } @@ -832,7 +832,7 @@ void DoUserDialog(char* filename) /* test if the user is running the correct plugin for this box */ if (!CheckPlatform(PLATFORM_ID, *(UINT16*)(FB + VERSION_ADR))) { - rb->splash(HZ*3, 0, true, "Wrong version"); + rb->splash(HZ*3, true, "Wrong version"); return; /* exit */ } @@ -840,7 +840,7 @@ void DoUserDialog(char* filename) result = CheckBootROM(); if (result == eUnknown) { /* no support for any other yet */ - rb->splash(HZ*3, 0, true, "Wrong boot ROM"); + rb->splash(HZ*3, true, "Wrong boot ROM"); return; /* exit */ } is_romless = (result == eROMless); @@ -861,7 +861,7 @@ void DoUserDialog(char* filename) sector = rb->plugin_get_buffer(&memleft); if (memleft < SEC_SIZE) /* need buffer for a flash sector */ { - rb->splash(HZ*3, 0, true, "Out of memory"); + rb->splash(HZ*3, true, "Out of memory"); return; /* exit */ } diff --git a/apps/plugins/helloworld.c b/apps/plugins/helloworld.c index ea347fb..d0fecba 100644 --- a/apps/plugins/helloworld.c +++ b/apps/plugins/helloworld.c @@ -42,7 +42,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) rb = api; /* now go ahead and have fun! */ - rb->splash(HZ*2, 0, true, "Hello world!"); + rb->splash(HZ*2, true, "Hello world!"); return PLUGIN_OK; } diff --git a/apps/plugins/rockbox_flash.c b/apps/plugins/rockbox_flash.c index 9dc4b3a..661203b 100644 --- a/apps/plugins/rockbox_flash.c +++ b/apps/plugins/rockbox_flash.c @@ -525,7 +525,7 @@ void DoUserDialog(char* filename, bool show_greet) sector = rb->plugin_get_buffer(&memleft); if (memleft < SECTORSIZE) /* need buffer for a flash sector */ { - rb->splash(HZ*3, 0, true, "Out of memory"); + rb->splash(HZ*3, true, "Out of memory"); return; /* exit */ } @@ -537,12 +537,12 @@ void DoUserDialog(char* filename, bool show_greet) if (FlashInfo.size == 0) /* no valid chip */ { - rb->splash(HZ*3, 0, true, "Not flashable"); + rb->splash(HZ*3, true, "Not flashable"); return; /* exit */ } else if (pos == 0) { - rb->splash(HZ*3, 0, true, "No image"); + rb->splash(HZ*3, true, "No image"); return; /* exit */ } @@ -701,7 +701,7 @@ void DoUserDialog(char* filename, bool show_greet) sector = rb->plugin_get_buffer(&memleft); if (memleft < SECTORSIZE) /* need buffer for a flash sector */ { - rb->splash(HZ*3, 0, true, "Out of memory"); + rb->splash(HZ*3, true, "Out of memory"); return; /* exit */ } @@ -716,12 +716,12 @@ void DoUserDialog(char* filename, bool show_greet) if (FlashInfo.size == 0) /* no valid chip */ { - rb->splash(HZ*3, 0, true, "Not flashable"); + rb->splash(HZ*3, true, "Not flashable"); return; /* exit */ } else if (pos == 0) { - rb->splash(HZ*3, 0, true, "No image"); + rb->splash(HZ*3, true, "No image"); return; /* exit */ } diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 2387fa9..47ae64c 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -241,7 +241,7 @@ static int get_level_count(void) char buffer[COLS + 3]; /* COLS plus CR/LF and \0 */ if ((fd = rb->open(LEVELS_FILE, O_RDONLY)) < 0) { - rb->splash(0, 0, true, "Unable to open %s", LEVELS_FILE); + rb->splash(0, true, "Unable to open %s", LEVELS_FILE); return -1; } @@ -858,7 +858,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) init_boards(); if (get_level_count() != 0) { - rb->splash(HZ*2,0,true,"Failed loading levels!"); + rb->splash(HZ*2, true, "Failed loading levels!"); return PLUGIN_OK; } diff --git a/apps/plugins/video.c b/apps/plugins/video.c index 5620253..c07519e 100644 --- a/apps/plugins/video.c +++ b/apps/plugins/video.c @@ -340,7 +340,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) if (parameter == NULL) { - rb->splash(HZ*2, 0, true, "Play .rvf file!"); + rb->splash(HZ*2, true, "Play .rvf file!"); return PLUGIN_ERROR; } diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 6f2c584..d8d6b51 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c @@ -662,8 +662,9 @@ static int viewer_recorder_on_button(int col) if (++page_mode == PAGE_MODES) page_mode = 0; - rb->splash(HZ, 0, true, "%s %s", - page_mode_str[page_mode], page_mode_str[PAGE_MODES]); + rb->splash(HZ, true, "%s %s", + page_mode_str[page_mode], + page_mode_str[PAGE_MODES]); viewer_draw(col); break; @@ -677,10 +678,11 @@ static int viewer_recorder_on_button(int col) init_need_scrollbar(); viewer_draw(col); - rb->splash(HZ, 0, true, "%s %s (%s %s)", - scrollbar_mode_str[SCROLLBAR_MODES], - scrollbar_mode_str[scrollbar_mode[view_mode]], - view_mode_str[view_mode], view_mode_str[VIEW_MODES]); + rb->splash(HZ, true, "%s %s (%s %s)", + scrollbar_mode_str[SCROLLBAR_MODES], + scrollbar_mode_str[scrollbar_mode[view_mode]], + view_mode_str[view_mode], + view_mode_str[VIEW_MODES]); } viewer_draw(col); break; @@ -744,7 +746,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) ok = viewer_init(file); if (!ok) { - rb->splash(HZ, 0, false, "Error"); + rb->splash(HZ, false, "Error"); viewer_exit(); return PLUGIN_OK; } @@ -776,8 +778,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) #endif viewer_draw(col); - rb->splash(HZ, 0, true, "%s %s", - word_mode_str[word_mode], word_mode_str[WORD_MODES]); + rb->splash(HZ, true, "%s %s", + word_mode_str[word_mode], + word_mode_str[WORD_MODES]); viewer_draw(col); break; @@ -801,8 +804,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) #endif viewer_draw(col); - rb->splash(HZ, 0, true, "%s %s", - line_mode_str[line_mode], line_mode_str[LINE_MODES]); + rb->splash(HZ, true, "%s %s", + line_mode_str[line_mode], + line_mode_str[LINE_MODES]); viewer_draw(col); break; @@ -814,8 +818,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) #endif /* View-width mode: NARROW or WIDE */ if (line_mode == JOIN) - rb->splash(HZ, 0, true, "(no %s %s)", - view_mode_str[WIDE], line_mode_str[JOIN]); + rb->splash(HZ, true, "(no %s %s)", + view_mode_str[WIDE], + line_mode_str[JOIN]); else if (++view_mode == VIEW_MODES) view_mode = 0; @@ -840,8 +845,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* file) #endif viewer_draw(col); - rb->splash(HZ, 0, true, "%s %s", - view_mode_str[view_mode], view_mode_str[VIEW_MODES]); + rb->splash(HZ, true, "%s %s", + view_mode_str[view_mode], + view_mode_str[VIEW_MODES]); viewer_draw(col); break; |