diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2012-05-24 20:59:05 -0400 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2012-05-24 20:59:05 -0400 |
| commit | 652b39b9e1ee324825e1a7d6b6c7feb3f4d9e880 (patch) | |
| tree | 44cf4ea17a323a1ce1de2f8846bed5a1d47675f5 /apps/playback.c | |
| parent | 4b97437c23b18cb31e69e623b0dc726c77ef4cd3 (diff) | |
| download | rockbox-652b39b9e1ee324825e1a7d6b6c7feb3f4d9e880.tar.gz rockbox-652b39b9e1ee324825e1a7d6b6c7feb3f4d9e880.zip | |
More snafu fix. Need a couple more patchups for now.
Must restore talk buffer explicitly when not taking it and promote
the buffer state.
Change-Id: Ia0341ede05837e6e94885a9ad62460c415ec6f00
Diffstat (limited to 'apps/playback.c')
| -rw-r--r-- | apps/playback.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/playback.c b/apps/playback.c index 21cc017aaf..9671f30100 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
| @@ -3624,8 +3624,7 @@ unsigned char * audio_get_buffer(bool talk_buf, size_t *buffer_size) | |||
| 3624 | if (buffer_state == AUDIOBUF_STATE_INITIALIZED) | 3624 | if (buffer_state == AUDIOBUF_STATE_INITIALIZED) |
| 3625 | buffering_reset(NULL, 0); /* mark buffer invalid */ | 3625 | buffering_reset(NULL, 0); /* mark buffer invalid */ |
| 3626 | 3626 | ||
| 3627 | if (talk_buf || buffer_state == AUDIOBUF_STATE_TRASHED | 3627 | if (talk_buf || !talk_voice_required()) |
| 3628 | || !talk_voice_required()) | ||
| 3629 | { | 3628 | { |
| 3630 | logf("get buffer: talk, audio"); | 3629 | logf("get buffer: talk, audio"); |
| 3631 | /* Ok to use everything from audiobuf - voice is loaded, | 3630 | /* Ok to use everything from audiobuf - voice is loaded, |