Mercurial > mplayer.hg

comparison libao2/ao_macosx.c @ 18885:5c8acc972551

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rm unnecesary casts from void* - part 4
author reynaldo
date Mon, 03 Jul 2006 13:21:54 +0000
parents 67266a949b51
children 99e20a22d5d0
comparison
equal deleted inserted replaced
18884:b635d250fd0e 18885:5c8acc972551
219 AURenderCallbackStruct renderCallback; 219 AURenderCallbackStruct renderCallback;
220 OSStatus err; 220 OSStatus err;
221 UInt32 size, maxFrames; 221 UInt32 size, maxFrames;
222 int aoIsCreated = ao != NULL; 222 int aoIsCreated = ao != NULL;
223 223
224 if (!aoIsCreated) ao = (ao_macosx_t *)malloc(sizeof(ao_macosx_t)); 224 if (!aoIsCreated) ao = malloc(sizeof(ao_macosx_t));
225 225
226 // Build Description for the input format 226 // Build Description for the input format
227 inDesc.mSampleRate=rate; 227 inDesc.mSampleRate=rate;
228 inDesc.mFormatID=kAudioFormatLinearPCM; 228 inDesc.mFormatID=kAudioFormatLinearPCM;
229 inDesc.mChannelsPerFrame=channels; 229 inDesc.mChannelsPerFrame=channels;
313 ao->chunk_size = maxFrames;//*inDesc.mBytesPerFrame; 313 ao->chunk_size = maxFrames;//*inDesc.mBytesPerFrame;
314 ao_msg(MSGT_AO,MSGL_V, "%5d chunk size\n", (int)ao->chunk_size); 314 ao_msg(MSGT_AO,MSGL_V, "%5d chunk size\n", (int)ao->chunk_size);
315 315
316 ao->num_chunks = NUM_BUFS; 316 ao->num_chunks = NUM_BUFS;
317 ao->buffer_len = (ao->num_chunks + 1) * ao->chunk_size; 317 ao->buffer_len = (ao->num_chunks + 1) * ao->chunk_size;
318 ao->buffer = aoIsCreated ? (unsigned char *)realloc(ao->buffer,(ao->num_chunks + 1)*ao->chunk_size) 318 ao->buffer = aoIsCreated ? realloc(ao->buffer,(ao->num_chunks + 1)*ao->chunk_size)
319 : (unsigned char *)calloc(ao->num_chunks + 1, ao->chunk_size); 319 : calloc(ao->num_chunks + 1, ao->chunk_size);
320 320
321 ao_data.samplerate = inDesc.mSampleRate; 321 ao_data.samplerate = inDesc.mSampleRate;
322 ao_data.channels = inDesc.mChannelsPerFrame; 322 ao_data.channels = inDesc.mChannelsPerFrame;
323 ao_data.outburst = ao_data.buffersize = ao->chunk_size; 323 ao_data.outburst = ao_data.buffersize = ao->chunk_size;
324 ao_data.bps = ao_data.samplerate * inDesc.mBytesPerFrame; 324 ao_data.bps = ao_data.samplerate * inDesc.mBytesPerFrame;