diff options
Diffstat (limited to 'apps/plugin.c')
-rw-r--r-- | apps/plugin.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index b1560c7182..a30b089e55 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -48,6 +48,7 @@ | |||
48 | #include "timer.h" | 48 | #include "timer.h" |
49 | #include "sound.h" | 49 | #include "sound.h" |
50 | #include "database.h" | 50 | #include "database.h" |
51 | #include "splash.h" | ||
51 | #if (CONFIG_CODEC == SWCODEC) | 52 | #if (CONFIG_CODEC == SWCODEC) |
52 | #include "pcm_playback.h" | 53 | #include "pcm_playback.h" |
53 | #endif | 54 | #endif |
@@ -138,7 +139,7 @@ static const struct plugin_api rockbox_api = { | |||
138 | backlight_on, | 139 | backlight_on, |
139 | backlight_off, | 140 | backlight_off, |
140 | backlight_set_timeout, | 141 | backlight_set_timeout, |
141 | splash, | 142 | gui_syncsplash, |
142 | #ifdef HAVE_REMOTE_LCD | 143 | #ifdef HAVE_REMOTE_LCD |
143 | /* remote lcd */ | 144 | /* remote lcd */ |
144 | lcd_remote_set_contrast, | 145 | lcd_remote_set_contrast, |
@@ -400,7 +401,7 @@ int plugin_load(const char* plugin, void* parameter) | |||
400 | fd = open(plugin, O_RDONLY); | 401 | fd = open(plugin, O_RDONLY); |
401 | if (fd < 0) { | 402 | if (fd < 0) { |
402 | snprintf(buf, sizeof buf, str(LANG_PLUGIN_CANT_OPEN), plugin); | 403 | snprintf(buf, sizeof buf, str(LANG_PLUGIN_CANT_OPEN), plugin); |
403 | splash(HZ*2, true, buf); | 404 | gui_syncsplash(HZ*2, true, buf); |
404 | return fd; | 405 | return fd; |
405 | } | 406 | } |
406 | 407 | ||
@@ -413,12 +414,12 @@ int plugin_load(const char* plugin, void* parameter) | |||
413 | if (plugin_size < 0) { | 414 | if (plugin_size < 0) { |
414 | /* read error */ | 415 | /* read error */ |
415 | snprintf(buf, sizeof buf, str(LANG_READ_FAILED), plugin); | 416 | snprintf(buf, sizeof buf, str(LANG_READ_FAILED), plugin); |
416 | splash(HZ*2, true, buf); | 417 | gui_syncsplash(HZ*2, true, buf); |
417 | return -1; | 418 | return -1; |
418 | } | 419 | } |
419 | if (plugin_size == 0) { | 420 | if (plugin_size == 0) { |
420 | /* loaded a 0-byte plugin, implying it's not for this model */ | 421 | /* loaded a 0-byte plugin, implying it's not for this model */ |
421 | splash(HZ*2, true, str(LANG_PLUGIN_WRONG_MODEL)); | 422 | gui_syncsplash(HZ*2, true, str(LANG_PLUGIN_WRONG_MODEL)); |
422 | return -1; | 423 | return -1; |
423 | } | 424 | } |
424 | #endif | 425 | #endif |
@@ -450,15 +451,15 @@ int plugin_load(const char* plugin, void* parameter) | |||
450 | return PLUGIN_USB_CONNECTED; | 451 | return PLUGIN_USB_CONNECTED; |
451 | 452 | ||
452 | case PLUGIN_WRONG_API_VERSION: | 453 | case PLUGIN_WRONG_API_VERSION: |
453 | splash(HZ*2, true, str(LANG_PLUGIN_WRONG_VERSION)); | 454 | gui_syncsplash(HZ*2, true, str(LANG_PLUGIN_WRONG_VERSION)); |
454 | break; | 455 | break; |
455 | 456 | ||
456 | case PLUGIN_WRONG_MODEL: | 457 | case PLUGIN_WRONG_MODEL: |
457 | splash(HZ*2, true, str(LANG_PLUGIN_WRONG_MODEL)); | 458 | gui_syncsplash(HZ*2, true, str(LANG_PLUGIN_WRONG_MODEL)); |
458 | break; | 459 | break; |
459 | 460 | ||
460 | default: | 461 | default: |
461 | splash(HZ*2, true, str(LANG_PLUGIN_ERROR)); | 462 | gui_syncsplash(HZ*2, true, str(LANG_PLUGIN_ERROR)); |
462 | break; | 463 | break; |
463 | } | 464 | } |
464 | 465 | ||