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/playlist.c | |
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/playlist.c')
-rw-r--r-- | apps/playlist.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/apps/playlist.c b/apps/playlist.c index 564cd03d90..8334260242 100644 --- a/apps/playlist.c +++ b/apps/playlist.c @@ -533,13 +533,7 @@ static int add_indices_to_playlist(struct playlist_info* playlist, { /* use mp3 buffer for maximum load speed */ audio_stop(); -#if CONFIG_CODEC != SWCODEC - talk_buffer_steal(); /* we use the mp3 buffer, need to tell */ - buflen = (audiobufend - audiobuf); - buffer = (char *)audiobuf; -#else - buffer = (char *)audio_get_buffer(false, &buflen); -#endif + buffer = audio_get_buffer(false, &buflen); } store_index = true; @@ -2018,13 +2012,7 @@ int playlist_resume(void) bool sorted = true; /* use mp3 buffer for maximum load speed */ -#if CONFIG_CODEC != SWCODEC - talk_buffer_steal(); /* we use the mp3 buffer, need to tell */ - buflen = (audiobufend - audiobuf); - buffer = (char *)audiobuf; -#else buffer = (char *)audio_get_buffer(false, &buflen); -#endif empty_playlist(playlist, true); @@ -2449,10 +2437,6 @@ void playlist_start(int start_index, int offset) playlist->index = start_index; -#if CONFIG_CODEC != SWCODEC - talk_buffer_steal(); /* will use the mp3 buffer */ -#endif - playlist->started = true; sync_control(playlist, false); audio_play(offset); |