The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2025-02-16 20:39:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small refactoring + cleanup

Browse Source
This commit is contained in:
simon.kagstrom 2009-01-05 17:28:38 +00:00
parent bc8ae7ea85
commit 1ff938c50c
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Src/SID_wii.i
View File

@ -89,5 +89,5 @@ void DigitalRenderer::EmulateLine(void)
calc_buffer(sound_buffer, datalen * 2); calc_buffer(sound_buffer, datalen * 2);
PlaySound(sound_buffer, datalen); PlaySound(sound_buffer, datalen);
} }
} }

35
Src/gcaudio.c
View File

@ -15,9 +15,15 @@
#define SAMPLERATE 48000 #define SAMPLERATE 48000
#define MIXBUFSIZE_BYTES 16000
#define MIXBUFSIZE_SHORT (MIXBUFSIZE_BYTES / 2)
#define MIXBUFSIZE_WORDS (MIXBUFSIZE_BYTES / 4)
#define SOUNDBUFSIZE 3840
static u8 ConfigRequested = 0; static u8 ConfigRequested = 0;
static u8 soundbuffer[2][3840] ATTRIBUTE_ALIGN(32); static u8 soundbuffer[2][SOUNDBUFSIZE] ATTRIBUTE_ALIGN(32);
static u8 mixbuffer[16000]; static u8 mixbuffer[MIXBUFSIZE_BYTES];
static int mixhead = 0; static int mixhead = 0;
static int mixtail = 0; static int mixtail = 0;
static int whichab = 0; static int whichab = 0;
@ -41,14 +47,14 @@ static int MixerCollect( u8 *outbuffer, int len )
while ( ( mixtail != mixhead ) && ( done < len ) ) while ( ( mixtail != mixhead ) && ( done < len ) )
{ {
*dst++ = src[mixtail++]; *dst++ = src[mixtail++];
if (mixtail == 4000) mixtail = 0; if (mixtail == MIXBUFSIZE_WORDS) mixtail = 0;
done += 4; done += 4;
} }
// Realign to 32 bytes for DMA // Realign to 32 bytes for DMA
mixtail -= ((done&0x1f) >> 2); mixtail -= ((done&0x1f) >> 2);
if (mixtail < 0) if (mixtail < 0)
mixtail += 4000; mixtail += MIXBUFSIZE_WORDS;
done &= ~0x1f; done &= ~0x1f;
if (!done) if (!done)
return len >> 1; return len >> 1;
@ -65,7 +71,7 @@ static void AudioSwitchBuffers()
{ {
if ( !ConfigRequested ) if ( !ConfigRequested )
{ {
int len = MixerCollect( soundbuffer[whichab], 3840 ); int len = MixerCollect( soundbuffer[whichab], SOUNDBUFSIZE );
DCFlushRange(soundbuffer[whichab], len); DCFlushRange(soundbuffer[whichab], len);
AUDIO_InitDMA((u32)soundbuffer[whichab], len); AUDIO_InitDMA((u32)soundbuffer[whichab], len);
AUDIO_StartDMA(); AUDIO_StartDMA();
@ -85,8 +91,8 @@ void InitialiseAudio()
AUDIO_Init(NULL); // Start audio subsystem AUDIO_Init(NULL); // Start audio subsystem
AUDIO_SetDSPSampleRate(AI_SAMPLERATE_48KHZ); AUDIO_SetDSPSampleRate(AI_SAMPLERATE_48KHZ);
AUDIO_RegisterDMACallback( AudioSwitchBuffers ); AUDIO_RegisterDMACallback( AudioSwitchBuffers );
memset(soundbuffer, 0, 3840*2); memset(soundbuffer, 0, SOUNDBUFSIZE*2);
memset(mixbuffer, 0, 16000); memset(mixbuffer, 0, MIXBUFSIZE_BYTES);
} }
/**************************************************************************** /****************************************************************************
@ -107,8 +113,8 @@ void StopAudio()
***************************************************************************/ ***************************************************************************/
void ResetAudio() void ResetAudio()
{ {
memset(soundbuffer, 0, 3840*2); memset(soundbuffer, 0, SOUNDBUFSIZE*2);
memset(mixbuffer, 0, 16000); memset(mixbuffer, 0, MIXBUFSIZE_BYTES);
mixhead = mixtail = 0; mixhead = mixtail = 0;
} }
@ -120,21 +126,18 @@ void ResetAudio()
****************************************************************************/ ****************************************************************************/
void PlaySound( int16_t *Buffer, int count ) void PlaySound( int16_t *Buffer, int count )
{ {
int i;
u16 sample;
u32 *dst = (u32 *)mixbuffer; u32 *dst = (u32 *)mixbuffer;
u32 level; int i;
/* Protect against interrupts while adjusting head */
level = IRQ_Disable();
for( i = 0; i < count; i++ ) for( i = 0; i < count; i++ )
{ {
u16 sample;
sample = (Buffer[i] & 0xffff); sample = (Buffer[i] & 0xffff);
dst[mixhead++] = sample | ( sample << 16); dst[mixhead++] = sample | ( sample << 16);
if (mixhead == 4000) if (mixhead == MIXBUFSIZE_WORDS)
mixhead = 0; mixhead = 0;
} }
IRQ_Restore(level);
// Restart Sound Processing if stopped // Restart Sound Processing if stopped
if (IsPlaying == 0) if (IsPlaying == 0)