summaryrefslogtreecommitdiff
path: root/apps/playlist.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-08-14 15:13:00 +0000
committerThomas Martitz <kugel@rockbox.org>2011-08-14 15:13:00 +0000
commitd1322b71595336740eb5e18e5deed056ddb71c7a (patch)
tree812db6a9c2e9d78405ec0ed38465fd88dc5be748 /apps/playlist.c
parent9b9bd73dfb212d4192fccc5fc5e269fc6499139c (diff)
downloadrockbox-d1322b71595336740eb5e18e5deed056ddb71c7a.tar.gz
rockbox-d1322b71595336740eb5e18e5deed056ddb71c7a.zip
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.c18
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,
533 { 533 {
534 /* use mp3 buffer for maximum load speed */ 534 /* use mp3 buffer for maximum load speed */
535 audio_stop(); 535 audio_stop();
536#if CONFIG_CODEC != SWCODEC 536 buffer = audio_get_buffer(false, &buflen);
537 talk_buffer_steal(); /* we use the mp3 buffer, need to tell */
538 buflen = (audiobufend - audiobuf);
539 buffer = (char *)audiobuf;
540#else
541 buffer = (char *)audio_get_buffer(false, &buflen);
542#endif
543 } 537 }
544 538
545 store_index = true; 539 store_index = true;
@@ -2018,13 +2012,7 @@ int playlist_resume(void)
2018 bool sorted = true; 2012 bool sorted = true;
2019 2013
2020 /* use mp3 buffer for maximum load speed */ 2014 /* use mp3 buffer for maximum load speed */
2021#if CONFIG_CODEC != SWCODEC
2022 talk_buffer_steal(); /* we use the mp3 buffer, need to tell */
2023 buflen = (audiobufend - audiobuf);
2024 buffer = (char *)audiobuf;
2025#else
2026 buffer = (char *)audio_get_buffer(false, &buflen); 2015 buffer = (char *)audio_get_buffer(false, &buflen);
2027#endif
2028 2016
2029 empty_playlist(playlist, true); 2017 empty_playlist(playlist, true);
2030 2018
@@ -2449,10 +2437,6 @@ void playlist_start(int start_index, int offset)
2449 2437
2450 playlist->index = start_index; 2438 playlist->index = start_index;
2451 2439
2452#if CONFIG_CODEC != SWCODEC
2453 talk_buffer_steal(); /* will use the mp3 buffer */
2454#endif
2455
2456 playlist->started = true; 2440 playlist->started = true;
2457 sync_control(playlist, false); 2441 sync_control(playlist, false);
2458 audio_play(offset); 2442 audio_play(offset);