lpnf/lovr
1
0
Fork 0
mirror of https://github.com/bjornbytes/lovr.git synced 2024-07-02 12:33:52 +00:00
Code Issues Projects Releases Wiki Activity

Encapsulate "uses spatializer?" nature in lovrSourceUsesSpatializer

Browse source 
Also, remove accessor prototype for old IsSpatial() function
This commit is contained in:
mcc 2021-04-02 15:56:55 -04:00 committed by Bjorn
parent 245fed5e39
commit 6b099e467f
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/modules/audio/audio.c
View file

@ -110,7 +110,7 @@ static void onPlayback(ma_device* device, void* out, const void* in, uint32_t co
} }
// Read and convert raw frames until there's BUFFER_SIZE converted frames // Read and convert raw frames until there's BUFFER_SIZE converted frames
uint32_t channels = source->effects == EFFECT_NONE ? 2 : 1; uint32_t channels = lovrSourceUsesSpatializer(source) ? 1 : 2; // If spatializer isn't converting to stereo, converter must do it
uint64_t frameLimit = sizeof(raw) / lovrSoundGetChannelCount(source->sound) / sizeof(float); uint64_t frameLimit = sizeof(raw) / lovrSoundGetChannelCount(source->sound) / sizeof(float);
uint32_t framesToConvert = BUFFER_SIZE; uint32_t framesToConvert = BUFFER_SIZE;
uint32_t framesConverted = 0; uint32_t framesConverted = 0;
@ -145,7 +145,7 @@ static void onPlayback(ma_device* device, void* out, const void* in, uint32_t co
} }
// Spatialize // Spatialize
if (source->effects != EFFECT_NONE) { if (lovrSourceUsesSpatializer(source)) {
state.spatializer->apply(source, src, mix, BUFFER_SIZE, BUFFER_SIZE); state.spatializer->apply(source, src, mix, BUFFER_SIZE, BUFFER_SIZE);
src = mix; src = mix;
} }
@ -409,7 +409,7 @@ Source* lovrSourceCreate(Sound* sound, uint32_t effects) {
config.formatIn = miniaudioFormats[lovrSoundGetFormat(sound)]; config.formatIn = miniaudioFormats[lovrSoundGetFormat(sound)];
config.formatOut = miniaudioFormats[OUTPUT_FORMAT]; config.formatOut = miniaudioFormats[OUTPUT_FORMAT];
config.channelsIn = lovrSoundGetChannelCount(sound); config.channelsIn = lovrSoundGetChannelCount(sound);
config.channelsOut = effects == EFFECT_NONE ? 2 : 1; config.channelsOut = lovrSourceUsesSpatializer(source) ? 1 : 2; // See onPlayback
config.sampleRateIn = lovrSoundGetSampleRate(sound); config.sampleRateIn = lovrSoundGetSampleRate(sound);
config.sampleRateOut = SAMPLE_RATE; config.sampleRateOut = SAMPLE_RATE;
@ -525,6 +525,10 @@ double lovrSourceGetDuration(Source* source, TimeUnit units) {
return units == UNIT_SECONDS ? (double) frames / lovrSoundGetSampleRate(source->sound) : frames; return units == UNIT_SECONDS ? (double) frames / lovrSoundGetSampleRate(source->sound) : frames;
} }
bool lovrSourceUsesSpatializer(Source* source) {
return source->effects != EFFECT_NONE; // Currently, all effects require the spatializer
}
void lovrSourceGetPose(Source *source, float position[4], float orientation[4]) { void lovrSourceGetPose(Source *source, float position[4], float orientation[4]) {
memcpy(position, source->position, sizeof(source->position)); memcpy(position, source->position, sizeof(source->position));
memcpy(orientation, source->orientation, sizeof(source->orientation)); memcpy(orientation, source->orientation, sizeof(source->orientation));

2
src/modules/audio/audio.h
View file

@ -92,7 +92,7 @@ void lovrSourceSetVolume(Source* source, float volume, VolumeUnit units);
void lovrSourceSeek(Source* source, double time, TimeUnit units); void lovrSourceSeek(Source* source, double time, TimeUnit units);
double lovrSourceTell(Source* source, TimeUnit units); double lovrSourceTell(Source* source, TimeUnit units);
double lovrSourceGetDuration(Source* source, TimeUnit units); double lovrSourceGetDuration(Source* source, TimeUnit units);
bool lovrSourceIsSpatial(Source* source); bool lovrSourceUsesSpatializer(Source* source);
void lovrSourceGetPose(Source* source, float position[4], float orientation[4]); void lovrSourceGetPose(Source* source, float position[4], float orientation[4]);
void lovrSourceSetPose(Source* source, float position[4], float orientation[4]); void lovrSourceSetPose(Source* source, float position[4], float orientation[4]);
float lovrSourceGetRadius(Source* source); float lovrSourceGetRadius(Source* source);