Mercurial > mplayer.hg

comparison libao2/ao_coreaudio.c @ 29439:02dec439f717

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
100l, av_fifo_generic_read does not return anything useful, so ignore its return value and return len instead.
author reimar
date Sat, 08 Aug 2009 08:17:35 +0000
parents f01023c524c3
children 9d09ff127c25
comparison
equal deleted inserted replaced
29438:0b61e12a6ca2 29439:02dec439f717
113 * \brief remove data from ringbuffer 113 * \brief remove data from ringbuffer
114 */ 114 */
115 static int read_buffer(unsigned char* data,int len){ 115 static int read_buffer(unsigned char* data,int len){
116 int buffered = av_fifo_size(ao->buffer); 116 int buffered = av_fifo_size(ao->buffer);
117 if (len > buffered) len = buffered; 117 if (len > buffered) len = buffered;
118 return av_fifo_generic_read(ao->buffer, data, len, NULL); 118 av_fifo_generic_read(ao->buffer, data, len, NULL);
119 return len;
119 } 120 }
120 121
121 OSStatus theRenderProc(void *inRefCon, AudioUnitRenderActionFlags *inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumFrames, AudioBufferList *ioData) 122 OSStatus theRenderProc(void *inRefCon, AudioUnitRenderActionFlags *inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumFrames, AudioBufferList *ioData)
122 { 123 {
123 int amt=av_fifo_size(ao->buffer); 124 int amt=av_fifo_size(ao->buffer);