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

Minor audio backend cleanup

Browse source
This commit is contained in:
Clownacy 2019-09-16 23:08:05 +00:00
parent 5c040608cb
commit b6f8bf68ec
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Backends/Audio/SDL2.cpp
View file

@ -83,20 +83,15 @@ static void MixSounds(float *stream, unsigned int frames_total)
for (unsigned int i = 0; i < frames_to_do; ++i) for (unsigned int i = 0; i < frames_to_do; ++i)
{ {
// Get two samples, and normalise them to 0-1
const float sample1 = (sound->samples[(size_t)sound->position] - 128.0f) / 128.0f;
const float sample2 = (sound->samples[(size_t)sound->position + 1] - 128.0f) / 128.0f;
// Perform linear interpolation // Perform linear interpolation
// Get two samples
const unsigned char sample1 = sound->samples[(size_t)sound->position];
const unsigned char sample2 = sound->samples[(size_t)sound->position + 1];
// Interpolate
const float interpolated_sample = sample1 + ((sample2 - sample1) * (float)fmod(sound->position, 1.0)); const float interpolated_sample = sample1 + ((sample2 - sample1) * (float)fmod(sound->position, 1.0));
// Normalise to 0-1 *steam_pointer++ += interpolated_sample * sound->volume_l;
const float sample_normalised = (interpolated_sample - 128.0f) / 128.0f; *steam_pointer++ += interpolated_sample * sound->volume_r;
*steam_pointer++ += sample_normalised * sound->volume_l;
*steam_pointer++ += sample_normalised * sound->volume_r;
sound->position += sound->advance_delta; sound->position += sound->advance_delta;
} }
@ -109,8 +104,8 @@ static void MixSounds(float *stream, unsigned int frames_total)
} }
else else
{ {
sound->position = 0.0;
sound->playing = FALSE; sound->playing = FALSE;
sound->position = 0.0;
break; break;
} }
} }
@ -257,7 +252,7 @@ unsigned char* AudioBackend_LockSound(AudioBackend_Sound *sound, size_t *size)
SDL_LockAudioDevice(device_id); SDL_LockAudioDevice(device_id);
if (size) if (size != NULL)
*size = sound->frames; *size = sound->frames;
return sound->samples; return sound->samples;