gered/sdl-wii
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

change comments

Browse source
This commit is contained in:
dborth 2009-06-14 06:30:04 +00:00
parent 854235bdbc
commit 4b6ed2fd71
1 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
SDL/src/audio/wii/SDL_wiiaudio.c
View file

@ -66,42 +66,22 @@ AudioThread (void *arg)
// Is conversion required? // Is conversion required?
if (current_audio->convert.needed) if (current_audio->convert.needed)
{ {
// Dump out the conversion info.
// printf("----\n");
// printf("conversion is needed\n");
// printf("\tsrc_format = 0x%x\n", current_audio->convert.src_format);
// printf("\tdst_format = 0x%x\n", current_audio->convert.dst_format);
// printf("\trate_incr = %f\n", (float) current_audio->convert.rate_incr);
// printf("\tbuf = 0x%08x\n", current_audio->convert.buf);
// printf("\tlen = %d\n", current_audio->convert.len);
// printf("\tlen_cvt = %d\n", current_audio->convert.len_cvt);
// printf("\tlen_mult = %d\n", current_audio->convert.len_mult);
// printf("\tlen_ratio = %f\n", (float) current_audio->convert.len_ratio);
SDL_mutexP(current_audio->mixer_lock); SDL_mutexP(current_audio->mixer_lock);
// Get the client to produce audio. // Get the client to produce audio
current_audio->spec.callback( current_audio->spec.callback(
current_audio->spec.userdata, current_audio->spec.userdata,
current_audio->convert.buf, current_audio->convert.buf,
current_audio->convert.len); current_audio->convert.len);
SDL_mutexV(current_audio->mixer_lock); SDL_mutexV(current_audio->mixer_lock);
// Convert the audio. // Convert the audio
SDL_ConvertAudio(&current_audio->convert); SDL_ConvertAudio(&current_audio->convert);
// Sanity check. // Copy from SDL buffer to DMA buffer
//if (sizeof(DMABuffer) != current_audio->convert.len_cvt)
//{
//printf("The size of the DMA buffer (%u) doesn't match the converted buffer (%u)\n",
//sizeof(DMABuffer), current_audio->convert.len_cvt);
//}
// Copy from SDL buffer to DMA buffer.
memcpy(dma_buffers[whichab], current_audio->convert.buf, current_audio->convert.len_cvt); memcpy(dma_buffers[whichab], current_audio->convert.buf, current_audio->convert.len_cvt);
} }
else else
{ {
//printf("conversion is not needed\n");
SDL_mutexP(current_audio->mixer_lock); SDL_mutexP(current_audio->mixer_lock);
current_audio->spec.callback( current_audio->spec.callback(
current_audio->spec.userdata, current_audio->spec.userdata,
@ -117,8 +97,8 @@ AudioThread (void *arg)
} }
/**************************************************************************** /****************************************************************************
* MixSamples * DMACallback
* This continually calls S9xMixSamples On each DMA Completion * Playback audio and signal audio thread that more samples are required
***************************************************************************/ ***************************************************************************/
static void static void
DMACallback() DMACallback()