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

1 files changed, 15 insertions, 15 deletions

diff --git a/apps/mp3data.h b/apps/mp3data.h
index edda352aab..762c2f4583 100644
--- a/apps/mp3data.h
+++ b/apps/mp3data.h
@@ -26,6 +26,8 @@
 #define MPEG_VERSION2   1
 #define MPEG_VERSION2_5 2
 
+#include <string.h> /* size_t */
+
 struct mp3info {
     /* Standard MP3 frame header fields */
     int version;
@@ -63,23 +65,21 @@ unsigned long find_next_frame(int fd,
                               unsigned long reference_header);
 unsigned long mem_find_next_frame(int startpos, 
                                   long *offset, 
-                                  long max_offset, 
-                                  unsigned long reference_header);
+                                  long max_offset,
+                                  unsigned long reference_header,
+                                  unsigned char* buf, size_t buflen);
 int get_mp3file_info(int fd, 
                      struct mp3info *info);
-int count_mp3_frames(int fd, 
-                     int startpos, 
-                     int filesize,
-                     void (*progressfunc)(int));
-int create_xing_header(int fd, 
-                       long startpos, 
-                       long filesize,
-                       unsigned char *buf, 
-                       unsigned long num_frames,
-                       unsigned long rec_time, 
-                       unsigned long header_template,
-                       void (*progressfunc)(int), 
-                       bool generate_toc);
+
+int count_mp3_frames(int fd,  int startpos,  int filesize,
+                     void (*progressfunc)(int),
+                     unsigned char* buf, size_t buflen);
+
+int create_xing_header(int fd, long startpos, long filesize,
+                       unsigned char *buf, unsigned long num_frames,
+                       unsigned long rec_time, unsigned long header_template,
+                       void (*progressfunc)(int), bool generate_toc,
+                       unsigned char *tempbuf, size_t tempbuflen );
 
 extern unsigned long bytes2int(unsigned long b0,
                                unsigned long b1,