len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 21:55:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix disabling voice.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14821 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomasz Malesinski 2007-09-22 22:47:12 +00:00
parent f2ca1e8a7d
commit 8f8dbf4742
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/playback.c
View file

@ -391,7 +391,11 @@ void mp3_play_pause(bool play)
bool mp3_is_playing(void) bool mp3_is_playing(void)
{ {
#ifdef PLAYBACK_VOICE
return voice_is_playing; return voice_is_playing;
#else
return false;
#endif
} }
/* If voice could be swapped out - wait for it to return /* If voice could be swapped out - wait for it to return
@ -425,7 +429,9 @@ unsigned char *audio_get_buffer(bool talk_buf, size_t *buffer_size)
{ {
audio_hard_stop(); audio_hard_stop();
wait_for_voice_swap_in(); wait_for_voice_swap_in();
#ifdef PLAYBACK_VOICE
voice_stop(); voice_stop();
#endif
} }
/* else buffer_state will be BUFFER_STATE_TRASHED at this point */ /* else buffer_state will be BUFFER_STATE_TRASHED at this point */
@ -521,7 +527,9 @@ unsigned char *audio_get_recording_buffer(size_t *buffer_size)
of pending events to ensure trouble-free operation of encoders */ of pending events to ensure trouble-free operation of encoders */
audio_hard_stop(); audio_hard_stop();
wait_for_voice_swap_in(); wait_for_voice_swap_in();
#ifdef PLAYBACK_VOICE
voice_stop(); voice_stop();
#endif
talk_buffer_steal(); talk_buffer_steal();
#ifdef PLAYBACK_VOICE #ifdef PLAYBACK_VOICE
@ -931,7 +939,6 @@ static void swap_codec(void)
before it is called */ before it is called */
static void voice_stop(void) static void voice_stop(void)
{ {
#ifdef PLAYBACK_VOICE
/* Must have a voice codec loaded or we'll hang forever here */ /* Must have a voice codec loaded or we'll hang forever here */
if (!voice_codec_loaded) if (!voice_codec_loaded)
return; return;
@ -947,7 +954,6 @@ static void voice_stop(void)
if (!playing) if (!playing)
pcmbuf_play_stop(); pcmbuf_play_stop();
#endif
} /* voice_stop */ } /* voice_stop */
/* Is voice still speaking */ /* Is voice still speaking */
@ -959,16 +965,18 @@ static bool is_voice_speaking(void)
|| (!playing && pcm_is_playing()); || (!playing && pcm_is_playing());
} }
#endif /* PLAYBACK_VOICE */
/* Wait for voice to finish speaking. */ /* Wait for voice to finish speaking. */
/* Also only reliable when music is not also playing. */ /* Also only reliable when music is not also playing. */
void voice_wait(void) void voice_wait(void)
{ {
#ifdef PLAYBACK_VOICE
while (is_voice_speaking()) while (is_voice_speaking())
sleep(HZ/10); sleep(HZ/10);
#endif
} }
#endif /* PLAYBACK_VOICE */
static void set_filebuf_watermark(int seconds) static void set_filebuf_watermark(int seconds)
{ {
size_t bytes; size_t bytes;