Remove the FOAOut mixing buffer and associated post-processes

2 files changed, 3 insertions, 9 deletions

diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 1e35b2f6..b696d7d9 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -641,9 +641,6 @@ struct ALCdevice {
     MixParams Dry;
     ALsizei NumChannelsPerOrder[MAX_AMBI_ORDER+1]{};
 
-    /* First-order ambisonics output, to be upsampled to the dry buffer if different. */
-    MixParams FOAOut;
-
     /* "Real" output, which will be written to the device buffer. May alias the
      * dry buffer.
      */
@@ -653,18 +650,15 @@ struct ALCdevice {
     std::unique_ptr<DirectHrtfState> mHrtfState;
     HrtfEntry *mHrtf{nullptr};
 
-    /* UHJ encoder state */
+    /* Ambisonic-to-UHJ encoder */
     std::unique_ptr<Uhj2Encoder> Uhj_Encoder;
 
-    /* High quality Ambisonic decoder */
+    /* Ambisonic decoder for speakers */
     std::unique_ptr<BFormatDec> AmbiDecoder;
 
     /* Stereo-to-binaural filter */
     std::unique_ptr<bs2b> Bs2b;
 
-    /* First-order ambisonic upsampler for higher-order output */
-    std::unique_ptr<AmbiUpsampler> AmbiUp;
-
     POSTPROCESS PostProcess{};
 
     std::unique_ptr<FrontStablizer> Stablizer;
diff --git a/OpenAL32/alSource.cpp b/OpenAL32/alSource.cpp
index fbf6bfe6..30ba02f6 100644
--- a/OpenAL32/alSource.cpp
+++ b/OpenAL32/alSource.cpp
@@ -2835,7 +2835,7 @@ AL_API ALvoid AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources)
         if(((*buffer)->mFmtChannels == FmtBFormat2D || (*buffer)->mFmtChannels == FmtBFormat3D) &&
            device->mAmbiOrder > 1)
         {
-            voice->AmbiScales = AmbiUpsampler::GetHFOrderScales(1, device->mAmbiOrder);
+            voice->AmbiScales = BFormatDec::GetHFOrderScales(1, device->mAmbiOrder);
             voice->AmbiSplitter[0].init(400.0f / static_cast<ALfloat>(device->Frequency));
             for(ALsizei i{1};i < voice->NumChannels;++i)
                 voice->AmbiSplitter[i] = voice->AmbiSplitter[0];