summaryrefslogtreecommitdiffstats
path: root/apps/talk.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2014-01-29 07:14:58 +0100
committerThomas Martitz <kugel@rockbox.org>2014-02-02 19:40:39 +0100
commit57000b513bd54b9dba3b308b7734c88962b81ae3 (patch)
tree925ae0106fd68f1b5cd77fd89aa48eaa7e35bf9b /apps/talk.c
parent60dea95cad710095477a2f5e35bd5692f79f76da (diff)
downloadrockbox-57000b513bd54b9dba3b308b7734c88962b81ae3.tar.gz
rockbox-57000b513bd54b9dba3b308b7734c88962b81ae3.tar.bz2
rockbox-57000b513bd54b9dba3b308b7734c88962b81ae3.zip
talk: Make talk_voice_required() local to talk.c
Change-Id: I3a04760d550efab7f011a917597ef29c039b05bd
Diffstat (limited to 'apps/talk.c')
-rw-r--r--apps/talk.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/apps/talk.c b/apps/talk.c
index 2dcaf91420..88d9afab90 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -797,6 +797,16 @@ static void queue_clip(unsigned long clip_offset, long size, bool enqueue)
return;
}
+#if CONFIG_CODEC == SWCODEC
+/* return if a voice codec is required or not */
+static bool talk_voice_required(void)
+{
+ return (has_voicefile) /* Voice file is available */
+ || (global_settings.talk_dir_clip) /* Thumbnail clips are required */
+ || (global_settings.talk_file_clip);
+}
+#endif
+
/***************** Public implementation *****************/
void talk_init(void)
@@ -877,9 +887,9 @@ void talk_init(void)
#endif
#if CONFIG_CODEC == SWCODEC
- /* Safe to init voice playback engine now since we now know if talk is
- required or not */
- voice_thread_init();
+ /* Initialize the actual voice clip playback engine as well */
+ if (talk_voice_required())
+ voice_thread_init();
#endif
out:
@@ -887,16 +897,6 @@ out:
filehandle = -1;
}
-#if CONFIG_CODEC == SWCODEC
-/* return if a voice codec is required or not */
-bool talk_voice_required(void)
-{
- return (has_voicefile) /* Voice file is available */
- || (global_settings.talk_dir_clip) /* Thumbnail clips are required */
- || (global_settings.talk_file_clip);
-}
-#endif
-
/* somebody else claims the mp3 buffer, e.g. for regular play/record */
void talk_buffer_set_policy(int policy)
{