From a8d9a03cfb3c72d36933f3a1867ada00dff0d1d5 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Wed, 26 May 2010 04:51:24 +0000 Subject: SWCODEC: Wait for audio init to complete before starting radio or recording; hardware init might not be finished yet if those are the start screens. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26298 a1c6a512-1295-4272-9138-f99709370657 --- apps/radio/radio.c | 4 ++++ apps/recorder/recording.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/apps/radio/radio.c b/apps/radio/radio.c index 403d1ae36f..51c8982b07 100644 --- a/apps/radio/radio.c +++ b/apps/radio/radio.c @@ -464,6 +464,10 @@ int radio_screen(void) /* turn on radio */ #if CONFIG_CODEC == SWCODEC + /* This should be done before touching audio settings */ + while (!audio_is_thread_ready()) + sleep(0); + audio_set_input_source(AUDIO_SRC_FMRADIO, (radio_status == FMRADIO_PAUSED) ? SRCF_FMRADIO_PAUSED : SRCF_FMRADIO_PLAYING); diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 21db298184..c30098277d 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -1093,6 +1093,10 @@ bool recording_screen(bool no_source) #endif #if CONFIG_CODEC == SWCODEC + /* This should be done before touching audio settings */ + while (!audio_is_thread_ready()) + sleep(0); + /* recording_menu gets messed up: so prevent manus talking */ talk_disable(true); /* audio_init_recording stops anything playing when it takes the audio -- cgit v1.2.3