From f9f4907a50d6e5a1f4999fc3b66c6b5fafb4cf7a Mon Sep 17 00:00:00 2001
From: bjorn <tie.372@gmail.com>
Date: Sun, 7 Mar 2021 22:42:17 -0700
Subject: [PATCH] phonon fixes;

---
 CMakeLists.txt                         |  2 +-
 src/modules/audio/spatializer_phonon.c | 24 ++++++++++++------------
 src/resources/boot.lua                 |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9beca17c..2a41815c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,7 +256,7 @@ if(LOVR_USE_STEAM_AUDIO)
   if(NOT LOVR_STEAM_AUDIO_PATH)
     message(FATAL_ERROR "LOVR_USE_STEAM_AUDIO requires the LOVR_STEAM_AUDIO_PATH to be set to the location of the Steam Audio folder")
   endif()
-  include_directories("${STEAM_AUDIO_PATH}/include")
+  include_directories("${LOVR_STEAM_AUDIO_PATH}/include")
 endif()
 
 # Oculus Audio
diff --git a/src/modules/audio/spatializer_phonon.c b/src/modules/audio/spatializer_phonon.c
index 48074aa9..f6dbd202 100644
--- a/src/modules/audio/spatializer_phonon.c
+++ b/src/modules/audio/spatializer_phonon.c
@@ -224,7 +224,7 @@ uint32_t phonon_apply(Source* source, const float* input, float* output, uint32_
     .directivity.dipolePower = power
   };
 
-  lovrAudioGetAirAbsorption(iplSource.airAbsorptionModel.coefficients);
+  lovrAudioGetAbsorption(iplSource.airAbsorptionModel.coefficients);
 
   IPLDirectOcclusionMode occlusion = IPL_DIRECTOCCLUSION_NONE;
   IPLDirectOcclusionMethod volumetric = IPL_DIRECTOCCLUSION_RAYCAST;
@@ -305,17 +305,17 @@ bool phonon_setGeometry(float* vertices, uint32_t* indices, uint32_t vertexCount
   if (state.environmentalRenderer) phonon_iplDestroyEnvironment(&state.environmentalRenderer);
 
   IPLMaterial materials[] = {
-    [AUDIO_GENERIC] = { .10f, .20f, .30f, .05f, .100f, .050f, .030f },
-    [AUDIO_BRICK] = { .03f, .04f, .07f, .05f, .015f, .015f, .015f },
-    [AUDIO_CARPET] = { .24f, .69f, .73f, .05f, .020f, .005f, .003f },
-    [AUDIO_CERAMIC] = { .01f, .02f, .02f, .05f, .060f, .044f, .011f },
-    [AUDIO_CONCRETE] = { .05f, .07f, .08f, .05f, .015f, .002f, .001f },
-    [AUDIO_GLASS] = { .06f, .03f, .02f, .05f, .060f, .044f, .011f },
-    [AUDIO_GRAVEL] = { .60f, .70f, .80f, .05f, .031f, .012f, .008f },
-    [AUDIO_METAL] = { .20f, .07f, .06f, .05f, .200f, .025f, .010f },
-    [AUDIO_PLASTER] = { .12f, .06f, .04f, .05f, .056f, .056f, .004f },
-    [AUDIO_ROCK] = { .13f, .20f, .24f, .05f, .015f, .002f, .001f },
-    [AUDIO_WOOD] = { .11f, .07f, .06f, .05f, .070f, .014f, .005f }
+    [MATERIAL_GENERIC] = { .10f, .20f, .30f, .05f, .100f, .050f, .030f },
+    [MATERIAL_BRICK] = { .03f, .04f, .07f, .05f, .015f, .015f, .015f },
+    [MATERIAL_CARPET] = { .24f, .69f, .73f, .05f, .020f, .005f, .003f },
+    [MATERIAL_CERAMIC] = { .01f, .02f, .02f, .05f, .060f, .044f, .011f },
+    [MATERIAL_CONCRETE] = { .05f, .07f, .08f, .05f, .015f, .002f, .001f },
+    [MATERIAL_GLASS] = { .06f, .03f, .02f, .05f, .060f, .044f, .011f },
+    [MATERIAL_GRAVEL] = { .60f, .70f, .80f, .05f, .031f, .012f, .008f },
+    [MATERIAL_METAL] = { .20f, .07f, .06f, .05f, .200f, .025f, .010f },
+    [MATERIAL_PLASTER] = { .12f, .06f, .04f, .05f, .056f, .056f, .004f },
+    [MATERIAL_ROCK] = { .13f, .20f, .24f, .05f, .015f, .002f, .001f },
+    [MATERIAL_WOOD] = { .11f, .07f, .06f, .05f, .070f, .014f, .005f }
   };
 
   IPLSimulationSettings settings = (IPLSimulationSettings) {
diff --git a/src/resources/boot.lua b/src/resources/boot.lua
index 5c397c08..9a5e7f8e 100644
--- a/src/resources/boot.lua
+++ b/src/resources/boot.lua
@@ -115,7 +115,7 @@ function lovr.boot()
     },
     audio = {
       start = true,
-      spatializer = 'simple'
+      spatializer = nil
     },
     graphics = {
       debug = false