Skip to content

Commit c043bd4

Browse files
committed
Fixups;
1 parent 7f0058f commit c043bd4

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/modules/audio/audio.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ static struct {
100100
float orientation[4];
101101
float absorption[3];
102102
float reverb;
103-
float spatialization;
104103
#ifdef LOVR_USE_PHONON
105104
IPLContext phonon;
106105
IPLAudioSettings audioSettings;
@@ -1213,9 +1212,9 @@ static bool phonon_mix_source(Source* source, float* _src, float* dst, float* _t
12131212
}
12141213

12151214
// Direct effects, applied in-place
1216-
if (false) { // TODO if has any direct effect
1217-
IPLDirectEffectParams* params = &source->outputs[index].direct;
1218-
tail |= !iplDirectEffectApply(source->directEffect, params, &src, &src);
1215+
IPLDirectEffectParams* directParams = &source->outputs[index].direct;
1216+
if (directParams.flags) {
1217+
tail |= !iplDirectEffectApply(source->directEffect, directParams, &src, &src);
12191218
}
12201219

12211220
// Spatialization (either binaural, panning, or upmix)

src/modules/audio/audio.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ float lovrSourceGetPitch(Source* source);
112112
bool lovrSourceSetPitch(Source* source, float pitch);
113113
float lovrSourceGetVolume(Source* source, VolumeUnit units);
114114
void lovrSourceSetVolume(Source* source, float volume, VolumeUnit units);
115-
void lovrSourceGetReverb(Source* source, float* reverb, ReverbMode* mode);
116-
void lovrSourceSetReverb(Source* source, float volume, ReverbMode mode);
117115
void lovrSourceSeek(Source* source, double time, TimeUnit units);
118116
double lovrSourceTell(Source* source, TimeUnit units);
119117
double lovrSourceGetDuration(Source* source, TimeUnit units);
@@ -130,6 +128,8 @@ void lovrSourceGetFalloff(Source* source, float* innerDistance, float* outerDist
130128
void lovrSourceSetFalloff(Source* source, float innerDistance, float outerDistance, float outerVolume);
131129
void lovrSourceGetOcclusion(Source* source, uint32_t* occlusionRays, uint32_t* transmissionRays);
132130
void lovrSourceSetOcclusion(Source* source, uint32_t occlusionRays, uint32_t transmissionRays);
131+
void lovrSourceGetReverb(Source* source, float* reverb, ReverbMode* mode);
132+
void lovrSourceSetReverb(Source* source, float volume, ReverbMode mode);
133133
float lovrSourceGetSpatialization(Source* source);
134134
void lovrSourceSetSpatialization(Source* source, float spatialization);
135135

0 commit comments

Comments
 (0)