From 92492dcef1033632e49549dda4eafb059a2e2969 Mon Sep 17 00:00:00 2001 From: bjorn Date: Fri, 26 Feb 2021 13:24:01 -0700 Subject: [PATCH] rm spatial blend for now; --- src/api/l_audio_source.c | 16 ---------------- src/modules/audio/audio.c | 8 -------- src/modules/audio/audio.h | 2 -- src/modules/audio/spatializer_phonon.c | 2 +- 4 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/api/l_audio_source.c b/src/api/l_audio_source.c index 9deaa63a..52050bc2 100644 --- a/src/api/l_audio_source.c +++ b/src/api/l_audio_source.c @@ -95,20 +95,6 @@ static int l_lovrSourceIsSpatial(lua_State* L) { return 1; } -static int l_lovrSourceGetSpatialBlend(lua_State* L) { - Source* source = luax_checktype(L, 1, Source); - float blend = lovrSourceGetSpatialBlend(source); - lua_pushnumber(L, blend); - return 1; -} - -static int l_lovrSourceSetSpatialBlend(lua_State* L) { - Source* source = luax_checktype(L, 1, Source); - float blend = luax_checkfloat(L, 2); - lovrSourceSetSpatialBlend(source, blend); - return 0; -} - static int l_lovrSourceGetInterpolation(lua_State* L) { Source* source = luax_checktype(L, 1, Source); SourceInterpolation interpolation = lovrSourceGetInterpolation(source); @@ -303,8 +289,6 @@ const luaL_Reg lovrSource[] = { { "tell", l_lovrSourceTell }, { "getDuration", l_lovrSourceGetDuration }, { "isSpatial", l_lovrSourceIsSpatial }, - { "getSpatialBlend", l_lovrSourceGetSpatialBlend }, - { "setSpatialBlend", l_lovrSourceSetSpatialBlend }, { "getInterpolation", l_lovrSourceGetInterpolation }, { "setInterpolation", l_lovrSourceSetInterpolation }, { "getPosition", l_lovrSourceGetPosition }, diff --git a/src/modules/audio/audio.c b/src/modules/audio/audio.c index 128e07f1..d9755c0e 100644 --- a/src/modules/audio/audio.c +++ b/src/modules/audio/audio.c @@ -483,14 +483,6 @@ bool lovrSourceIsSpatial(Source *source) { return source->spatial; } -float lovrSourceGetSpatialBlend(Source* source) { - return source->blend; -} - -void lovrSourceSetSpatialBlend(Source* source, float blend) { - source->blend = blend; -} - SourceInterpolation lovrSourceGetInterpolation(Source* source) { return source->bilinear ? SOURCE_BILINEAR : SOURCE_NEAREST; } diff --git a/src/modules/audio/audio.h b/src/modules/audio/audio.h index 7b066617..8e9512cb 100644 --- a/src/modules/audio/audio.h +++ b/src/modules/audio/audio.h @@ -60,8 +60,6 @@ void lovrSourceSeek(Source* source, double time, TimeUnit units); double lovrSourceTell(Source* source, TimeUnit units); double lovrSourceGetDuration(Source* source, TimeUnit units); bool lovrSourceIsSpatial(Source* source); -float lovrSourceGetSpatialBlend(Source* source); -void lovrSourceSetSpatialBlend(Source* source, float blend); SourceInterpolation lovrSourceGetInterpolation(Source* source); void lovrSourceSetInterpolation(Source* source, SourceInterpolation interpolation); void lovrSourceGetPose(Source* source, float position[4], float orientation[4]); diff --git a/src/modules/audio/spatializer_phonon.c b/src/modules/audio/spatializer_phonon.c index ecc9cd68..d390eea5 100644 --- a/src/modules/audio/spatializer_phonon.c +++ b/src/modules/audio/spatializer_phonon.c @@ -249,7 +249,7 @@ uint32_t phonon_apply(Source* source, const float* input, float* output, uint32_ phonon_iplApplyDirectSoundEffect(state.directSoundEffect[index], in, path, options, tmp); - float blend = lovrSourceGetSpatialBlend(source); + float blend = 1.f; IPLHrtfInterpolation interpolation = lovrSourceGetInterpolation(source) == SOURCE_BILINEAR ? IPL_HRTFINTERPOLATION_BILINEAR : IPL_HRTFINTERPOLATION_NEAREST; phonon_iplApplyBinauralEffect(state.binauralEffect[index], state.binauralRenderer, tmp, path.direction, interpolation, blend, out);