devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

talk: Don't kill the talk engine after voicing the "invalid voice" clip

Browse source 
Unfortunately, this brings us back to the "Default" behavior of simply
not voicing talk clips at all if there's no voice file.

Change-Id: I457ec4e3fcefaaffcbf6222fe01617bf0903518c
This commit is contained in:
Solomon Peachy 2024-06-20 17:38:39 -04:00
parent bb12746972
commit fa6b6b6c2d
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/talk.c
View file

@ -5,7 +5,6 @@
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$
* *
* Copyright (C) 2004 Jörg Hohensohn * Copyright (C) 2004 Jörg Hohensohn
* *
@ -1080,6 +1079,7 @@ static int _talk_file(const char* filename,
/* reload needed? */ /* reload needed? */
if (talk_is_disabled()) if (talk_is_disabled())
return -1; return -1;
if (talk_handle <= 0 || index_handle <= 0) if (talk_handle <= 0 || index_handle <= 0)
{ {
fd = open_voicefile(); fd = open_voicefile();
@ -1605,8 +1605,6 @@ void talk_announce_voice_invalid(void)
if (global_settings.talk_menu && talk_status != TALK_STATUS_OK) if (global_settings.talk_menu && talk_status != TALK_STATUS_OK)
{ {
talk_temp_disable_count = 0xFF; /* don't let anyone else use voice sys */
voice_fd = open(talkfile, O_RDONLY); voice_fd = open(talkfile, O_RDONLY);
if (voice_fd < 0) if (voice_fd < 0)
goto out; /* can't open */ goto out; /* can't open */
@ -1632,13 +1630,12 @@ void talk_announce_voice_invalid(void)
qe.length = qe.remaining = voice_sz; qe.length = qe.remaining = voice_sz;
queue_clip(&qe, false); queue_clip(&qe, false);
voice_wait(); voice_wait();
voice_thread_kill();
} }
mutex_unlock(&read_buffer_mutex); mutex_unlock(&read_buffer_mutex);
buf_handle = buflib_free(&clip_ctx, buf_handle); buf_handle = buflib_free(&clip_ctx, buf_handle);
talk_handle = core_free(talk_handle);
out: out:
close(voice_fd); close(voice_fd);
return; return;