duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up Wii U audio backend

Browse source
This commit is contained in:
Clownacy 2020-04-17 14:15:23 +01:00
parent 9eacc74ee2
commit a177f44b88
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/Backends/Audio/WiiU.cpp
View file

@ -37,7 +37,7 @@ static double MillibelToScale(long volume)
return pow(10.0, volume / 2000.0); return pow(10.0, volume / 2000.0);
} }
static unsigned long tick_delta; static unsigned long ticks_per_second;
static unsigned long GetTicksMilliseconds(void) static unsigned long GetTicksMilliseconds(void)
{ {
@ -51,7 +51,7 @@ static unsigned long GetTicksMilliseconds(void)
last_tick = current_tick; last_tick = current_tick;
return (accumulator * 1000) / tick_delta; return (accumulator * 1000) / ticks_per_second;
} }
static int ThreadFunction(int argc, const char *argv[]) static int ThreadFunction(int argc, const char *argv[])
@ -62,7 +62,7 @@ static int ThreadFunction(int argc, const char *argv[])
if (organya_milliseconds == 0) if (organya_milliseconds == 0)
{ {
OSSleepTicks(1); OSSleepTicks(ticks_per_second / 1000);
} }
else else
{ {
@ -79,7 +79,7 @@ static int ThreadFunction(int argc, const char *argv[])
break; break;
} }
OSSleepTicks(1); OSSleepTicks(ticks_per_second / 1000);
} }
if (organya_callback != NULL) if (organya_callback != NULL)
@ -102,7 +102,8 @@ bool AudioBackend_Init(void)
AXInitWithParams(&initparams); AXInitWithParams(&initparams);
} }
tick_delta = OSGetSystemInfo()->busClockSpeed / 4;
ticks_per_second = OSGetSystemInfo()->busClockSpeed / 4;
OSRunThread(OSGetDefaultThread(0), ThreadFunction, 0, NULL); OSRunThread(OSGetDefaultThread(0), ThreadFunction, 0, NULL);
@ -113,8 +114,7 @@ void AudioBackend_Deinit(void)
{ {
OSCancelThread(OSGetDefaultThread(0)); OSCancelThread(OSGetDefaultThread(0));
//int result; OSJoinThread(OSGetDefaultThread(0), NULL);
//OSJoinThread(&thread, &result);
AXQuit(); AXQuit();
} }
@ -168,17 +168,15 @@ void AudioBackend_PlaySound(AudioBackend_Sound *sound, bool looping)
if (voice != NULL) if (voice != NULL)
{ {
AXVoiceOffsets offs;
AXVoiceVeData vol = {
.volume = sound->volume,
};
AXVoiceBegin(voice); AXVoiceBegin(voice);
AXSetVoiceType(voice, 0); AXSetVoiceType(voice, 0);
AXVoiceVeData vol = {.volume = sound->volume};
AXSetVoiceVe(voice, &vol); AXSetVoiceVe(voice, &vol);
static AXVoiceDeviceMixData mix_data[1][6]; AXVoiceDeviceMixData mix_data[1][6];
memset(mix_data, 0, sizeof(mix_data));
mix_data[0][0].bus[0].volume = sound->pan_l; mix_data[0][0].bus[0].volume = sound->pan_l;
mix_data[0][1].bus[0].volume = sound->pan_r; mix_data[0][1].bus[0].volume = sound->pan_r;
@ -189,6 +187,7 @@ void AudioBackend_PlaySound(AudioBackend_Sound *sound, bool looping)
AXSetVoiceSrcRatio(voice, srcratio); AXSetVoiceSrcRatio(voice, srcratio);
AXSetVoiceSrcType(voice, AX_VOICE_SRC_TYPE_LINEAR); AXSetVoiceSrcType(voice, AX_VOICE_SRC_TYPE_LINEAR);
AXVoiceOffsets offs;
offs.dataType = AX_VOICE_FORMAT_LPCM8; offs.dataType = AX_VOICE_FORMAT_LPCM8;
offs.endOffset = sound->length; offs.endOffset = sound->length;
offs.loopingEnabled = AX_VOICE_LOOP_DISABLED; offs.loopingEnabled = AX_VOICE_LOOP_DISABLED;
@ -214,7 +213,6 @@ void AudioBackend_StopSound(AudioBackend_Sound *sound)
{ {
if (sound->voice != NULL) if (sound->voice != NULL)
{ {
// AXSetVoiceState(sound->voice, AX_VOICE_STATE_STOPPED);
AXFreeVoice(sound->voice); AXFreeVoice(sound->voice);
sound->voice = NULL; sound->voice = NULL;
} }
@ -223,11 +221,8 @@ void AudioBackend_StopSound(AudioBackend_Sound *sound)
void AudioBackend_RewindSound(AudioBackend_Sound *sound) void AudioBackend_RewindSound(AudioBackend_Sound *sound)
{ {
if (sound->voice != NULL) if (sound->voice != NULL)
{
// AXSetVoiceState(sound->voice, AX_VOICE_STATE_STOPPED);
AXSetVoiceCurrentOffset(sound->voice, 0); AXSetVoiceCurrentOffset(sound->voice, 0);
} }
}
void AudioBackend_SetSoundFrequency(AudioBackend_Sound *sound, unsigned int frequency) void AudioBackend_SetSoundFrequency(AudioBackend_Sound *sound, unsigned int frequency)
{ {
@ -259,7 +254,8 @@ void AudioBackend_SetSoundPan(AudioBackend_Sound *sound, long pan)
sound->pan_l = (unsigned short)(0x8000 * MillibelToScale(-pan)); sound->pan_l = (unsigned short)(0x8000 * MillibelToScale(-pan));
sound->pan_r = (unsigned short)(0x8000 * MillibelToScale(pan)); sound->pan_r = (unsigned short)(0x8000 * MillibelToScale(pan));
static AXVoiceDeviceMixData mix_data[1][6]; AXVoiceDeviceMixData mix_data[1][6];
memset(mix_data, 0, sizeof(mix_data));
mix_data[0][0].bus[0].volume = sound->pan_l; mix_data[0][0].bus[0].volume = sound->pan_l;
mix_data[0][1].bus[0].volume = sound->pan_r; mix_data[0][1].bus[0].volume = sound->pan_r;