diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2011-08-14 15:13:00 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2011-08-14 15:13:00 +0000 |
| commit | d1322b71595336740eb5e18e5deed056ddb71c7a (patch) | |
| tree | 812db6a9c2e9d78405ec0ed38465fd88dc5be748 /apps/talk.h | |
| parent | 9b9bd73dfb212d4192fccc5fc5e269fc6499139c (diff) | |
GSoC/Buflib: Replace all direct accesses to audiobuf with buffer API functions.
Namely, introduce buffer_get_buffer() and buffer_release_buffer().
buffer_get_buffer() aquires all available and grabs a lock, attempting to
call buffer_alloc() or buffer_get_buffer() while this lock is locked will cause
a panicf() (doesn't actually happen, but is for debugging purpose).
buffer_release_buffer() unlocks that lock and can additionally increment the
audiobuf buffer to make an allocation. Pass 0 to only unlock if buffer was
used temporarily only.
buffer_available() is a replacement function to query audiobuflen, i.e. what's
left in the buffer.
Buffer init is moved up in the init chain and handles ipodvideo64mb internally.
Further changes happened to mp3data.c and talk.c as to not call the above API
functions, but get the buffer from callers. The caller is the audio system
which has the buffer lock while mp3data.c and talk mess with the buffer.
mpeg.c now implements some buffer related functions of playback.h, especially
audio_get_buffer(), allowing to reduce #ifdef hell a tiny bit.
audiobuf and audiobufend are local to buffer.c now.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30308 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/talk.h')
| -rw-r--r-- | apps/talk.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/talk.h b/apps/talk.h index a2a9f44e4e..e1702147c7 100644 --- a/apps/talk.h +++ b/apps/talk.h @@ -80,6 +80,7 @@ void talk_init(void); bool talk_voice_required(void); /* returns true if voice codec required */ #endif int talk_get_bufsize(void); /* get the loaded voice file size */ +size_t talkbuf_init(char* bufstart); void talk_buffer_steal(void); /* claim the mp3 buffer e.g. for play/record */ bool is_voice_queued(void); /* Are there more voice clips to be spoken? */ int talk_id(int32_t id, bool enqueue); /* play a voice ID from voicefont */ |