summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Wilgus <me.theuser@yahoo.com>2020-05-22 07:52:01 -0500
committerWilliam Wilgus <me.theuser@yahoo.com>2020-05-22 07:52:01 -0500
commitdcf8154c3244e1f41c62abdfec02169e7f14cd47 (patch)
tree85e3409d3a62559e195bea3c09000c16115e644d
parent74f358cf8b909aab5d1b9a157765ef6dcd8fe9dc (diff)
downloadrockbox-dcf8154c3244e1f41c62abdfec02169e7f14cd47.tar.gz
rockbox-dcf8154c3244e1f41c62abdfec02169e7f14cd47.zip
talk.h add failed to load splash
Change-Id: Ie355a52bb6c687d302dc3e39693b9ab40e2dd699
-rw-r--r--apps/debug_menu.c6
-rw-r--r--apps/talk.c5
2 files changed, 6 insertions, 5 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 1ba1e30102..a46c169844 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -2369,13 +2369,11 @@ static const char* dbg_talk_get_name(int selected_item, void *data,
2369 buffer = "No voice information available"; 2369 buffer = "No voice information available";
2370 break; 2370 break;
2371 case 1: 2371 case 1:
2372 if (talk_data->status == TALK_STATUS_OK) 2372 if (talk_data->status != TALK_STATUS_OK)
2373 buffer = "Talk Status: OK";
2374 else if (talk_data->status != TALK_STATUS_ERR_INCOMPATIBLE)
2375 snprintf(buffer, buffer_len, "Talk Status: ERR (%i)", 2373 snprintf(buffer, buffer_len, "Talk Status: ERR (%i)",
2376 talk_data->status); 2374 talk_data->status);
2377 else 2375 else
2378 buffer = "Talk Status: ERR Incompatible voice file"; 2376 buffer = "Talk Status: OK";
2379 break; 2377 break;
2380 case 2: 2378 case 2:
2381 snprintf(buffer, buffer_len, "Number of (empty) clips in voice file: (%d) %d", 2379 snprintf(buffer, buffer_len, "Number of (empty) clips in voice file: (%d) %d",
diff --git a/apps/talk.c b/apps/talk.c
index b561d5cde8..ec0ba67f38 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -31,6 +31,7 @@
31#include "kernel.h" 31#include "kernel.h"
32#include "settings.h" 32#include "settings.h"
33#include "settings_list.h" 33#include "settings_list.h"
34#include "splash.h"
34#if CONFIG_CODEC == SWCODEC 35#if CONFIG_CODEC == SWCODEC
35#include "voice_thread.h" 36#include "voice_thread.h"
36#else 37#else
@@ -937,8 +938,10 @@ void talk_init(void)
937 if (filehandle > 0) 938 if (filehandle > 0)
938 { 939 {
939 if (!load_voicefile_index(filehandle)) 940 if (!load_voicefile_index(filehandle))
941 {
942 splashf(HZ * 2, str(LANG_READ_FAILED), ".voice");
940 goto out; 943 goto out;
941 944 }
942 /* Now determine the maximum buffer size needed for the voicefile. 945 /* Now determine the maximum buffer size needed for the voicefile.
943 * The below pretends the entire voicefile would be loaded. The buffer 946 * The below pretends the entire voicefile would be loaded. The buffer
944 * size is eventually capped later on in load_voicefile_data() */ 947 * size is eventually capped later on in load_voicefile_data() */