3 files changed, 5 insertions, 9 deletions
diff --git a/Alc/alc.cpp b/Alc/alc.cpp
index d96f6df0..4c724fd6 100644
--- a/Alc/alc.cpp
+++ b/Alc/alc.cpp
@@ -53,6 +53,7 @@
 #include "alconfig.h"
 #include "ringbuffer.h"
 #include "filters/splitter.h"
+#include "bs2b.h"
 
 #include "fpu_modes.h"
 #include "cpu_caps.h"
@@ -1990,8 +1991,6 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
         return ALC_NO_ERROR;
 
     device->Uhj_Encoder = nullptr;
-
-    al_free(device->Bs2b);
     device->Bs2b = nullptr;
 
     device->ChannelDelay.clear();
@@ -2421,9 +2420,6 @@ ALCdevice_struct::~ALCdevice_struct()
     HrtfHandle = nullptr;
     al_free(Hrtf);
     Hrtf = nullptr;
-
-    al_free(Bs2b);
-    Bs2b = nullptr;
 }
 
 
diff --git a/Alc/alu.cpp b/Alc/alu.cpp
index 9372da85..a8f2f402 100644
--- a/Alc/alu.cpp
+++ b/Alc/alu.cpp
@@ -175,7 +175,7 @@ void ProcessBs2b(ALCdevice *device, ALsizei SamplesToDo)
     assert(lidx != -1 && ridx != -1);
 
     /* Apply binaural/crossfeed filter */
-    bs2b_cross_feed(device->Bs2b, device->RealOut.Buffer[lidx],
+    bs2b_cross_feed(device->Bs2b.get(), device->RealOut.Buffer[lidx],
                     device->RealOut.Buffer[ridx], SamplesToDo);
 }
 
diff --git a/Alc/panning.cpp b/Alc/panning.cpp
index e9a410e1..29c708f6 100644
--- a/Alc/panning.cpp
+++ b/Alc/panning.cpp
@@ -1163,7 +1163,7 @@ void aluInitRenderer(ALCdevice *device, ALint hrtf_id, enum HrtfRequestMode hrtf
 no_hrtf:
     if(old_hrtf)
         Hrtf_DecRef(old_hrtf);
-    old_hrtf = NULL;
+    old_hrtf = nullptr;
     TRACE("HRTF disabled\n");
 
     device->Render_Mode = StereoPair;
@@ -1176,8 +1176,8 @@ no_hrtf:
         ConfigValueInt(device->DeviceName.c_str(), NULL, "cf_level", &bs2blevel);
     if(bs2blevel > 0 && bs2blevel <= 6)
     {
-        device->Bs2b = reinterpret_cast<struct bs2b*>(al_calloc(16, sizeof(*device->Bs2b)));
-        bs2b_set_params(device->Bs2b, bs2blevel, device->Frequency);
+        device->Bs2b.reset(new bs2b{});
+        bs2b_set_params(device->Bs2b.get(), bs2blevel, device->Frequency);
         TRACE("BS2B enabled\n");
         InitPanning(device);
         return;