[MPlayer-cvslog] r29481 - in trunk/libao2: ao_coreaudio.c ao_sdl.c

[reimar]

Author: reimar
Date: Sat Aug  8 10:17:35 2009
New Revision: 29481

Log:
100l, av_fifo_generic_read does not return anything useful, so ignore its
return value and return len instead.

Modified:
   trunk/libao2/ao_coreaudio.c
   trunk/libao2/ao_sdl.c

Modified: trunk/libao2/ao_coreaudio.c
==============================================================================
--- trunk/libao2/ao_coreaudio.c	Fri Aug  7 11:07:02 2009	(r29480)
+++ trunk/libao2/ao_coreaudio.c	Sat Aug  8 10:17:35 2009	(r29481)
@@ -115,7 +115,8 @@ static int write_buffer(unsigned char* d
 static int read_buffer(unsigned char* data,int len){
   int buffered = av_fifo_size(ao->buffer);
   if (len > buffered) len = buffered;
-  return av_fifo_generic_read(ao->buffer, data, len, NULL);
+  av_fifo_generic_read(ao->buffer, data, len, NULL);
+  return len;
 }
 
 OSStatus theRenderProc(void *inRefCon, AudioUnitRenderActionFlags *inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumFrames, AudioBufferList *ioData)

Modified: trunk/libao2/ao_sdl.c
==============================================================================
--- trunk/libao2/ao_sdl.c	Fri Aug  7 11:07:02 2009	(r29480)
+++ trunk/libao2/ao_sdl.c	Sat Aug  8 10:17:35 2009	(r29481)
@@ -82,10 +82,11 @@ static int read_buffer(unsigned char* da
   int buffered = av_fifo_size(buffer);
   if (len > buffered) len = buffered;
 #ifdef USE_SDL_INTERNAL_MIXER
-  return av_fifo_generic_read(buffer, data, len, mix_audio);
+  av_fifo_generic_read(buffer, data, len, mix_audio);
 #else
-  return av_fifo_generic_read(buffer, data, len, NULL);
+  av_fifo_generic_read(buffer, data, len, NULL);
 #endif
+  return len;
 }
 
 // end ring buffer stuff