summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMagnus Holmgren <magnushol@gmail.com>2005-10-16 12:05:58 +0000
committerMagnus Holmgren <magnushol@gmail.com>2005-10-16 12:05:58 +0000
commit0293dba5d28c336d2438660f194bd6b9a2f00a90 (patch)
tree06a9654e7944c54eea8ef3f67a6e1c2d50b683f0 /apps
parent49608086510a37f75907caf4d1797a0a6bf627ac (diff)
downloadrockbox-0293dba5d28c336d2438660f194bd6b9a2f00a90.tar.gz
rockbox-0293dba5d28c336d2438660f194bd6b9a2f00a90.tar.bz2
rockbox-0293dba5d28c336d2438660f194bd6b9a2f00a90.zip
iRiver: The audio init fix caused problems if a voice file was present.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7635 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/playback.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/playback.c b/apps/playback.c
index 7c8339f3d3..d38e1f4527 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -1889,6 +1889,9 @@ void voice_codec_thread(void)
void voice_init(void)
{
+ if (!filebuf)
+ return; /* Audio buffers not yet set up */
+
while (voice_codec_loaded)
{
logf("Terminating voice codec");
@@ -2291,16 +2294,16 @@ void audio_init(void)
queue_init(&codec_queue);
queue_init(&voice_codec_queue);
- /* Apply relevant settings */
- audio_set_buffer_margin(global_settings.buffer_margin);
- audio_set_crossfade(global_settings.crossfade);
-
create_thread(codec_thread, codec_stack, sizeof(codec_stack),
codec_thread_name);
create_thread(voice_codec_thread, voice_codec_stack,
sizeof(voice_codec_stack), voice_codec_thread_name);
create_thread(audio_thread, audio_stack, sizeof(audio_stack),
audio_thread_name);
+
+ /* Apply relevant settings */
+ audio_set_buffer_margin(global_settings.buffer_margin);
+ audio_set_crossfade(global_settings.crossfade);
}