summaryrefslogtreecommitdiffstats
path: root/apps
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 /apps
parent74f358cf8b909aab5d1b9a157765ef6dcd8fe9dc (diff)
downloadrockbox-dcf8154c3244e1f41c62abdfec02169e7f14cd47.tar.gz
rockbox-dcf8154c3244e1f41c62abdfec02169e7f14cd47.tar.bz2
rockbox-dcf8154c3244e1f41c62abdfec02169e7f14cd47.zip
talk.h add failed to load splash
Change-Id: Ie355a52bb6c687d302dc3e39693b9ab40e2dd699
Diffstat (limited to 'apps')
-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,
buffer = "No voice information available";
break;
case 1:
- if (talk_data->status == TALK_STATUS_OK)
- buffer = "Talk Status: OK";
- else if (talk_data->status != TALK_STATUS_ERR_INCOMPATIBLE)
+ if (talk_data->status != TALK_STATUS_OK)
snprintf(buffer, buffer_len, "Talk Status: ERR (%i)",
talk_data->status);
else
- buffer = "Talk Status: ERR Incompatible voice file";
+ buffer = "Talk Status: OK";
break;
case 2:
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 @@
#include "kernel.h"
#include "settings.h"
#include "settings_list.h"
+#include "splash.h"
#if CONFIG_CODEC == SWCODEC
#include "voice_thread.h"
#else
@@ -937,8 +938,10 @@ void talk_init(void)
if (filehandle > 0)
{
if (!load_voicefile_index(filehandle))
+ {
+ splashf(HZ * 2, str(LANG_READ_FAILED), ".voice");
goto out;
-
+ }
/* Now determine the maximum buffer size needed for the voicefile.
* The below pretends the entire voicefile would be loaded. The buffer
* size is eventually capped later on in load_voicefile_data() */