Merge branch 'release/1.1.4' of https://github.com/3DTune-In/3dti_AudioToolkit_VST_Plugins into release/1.1.4

ragnaringi · ragnaringi · commit a5c8c11085dd · 2022-03-22T07:25:18.000Z
diff --git a/Source/Binaural/AnechoicProcessor.cpp b/Source/Binaural/AnechoicProcessor.cpp
@@ -53,17 +53,25 @@ AnechoicProcessor::AnechoicProcessor (Binaural::CCore& core)
 
 AnechoicProcessor::~AnechoicProcessor()
 {
-    stopTimer();
 }
 
 void AnechoicProcessor::setup (double sampleRate)
 {
+    auto position = getSourcePosition();
+    
+    if (! mSources.empty())
+    {
+        mSources.clear();
+        mTransforms.clear();
+    }
+    
+    addSoundSource (position);
+    
     auto blockSize = mCore.GetAudioState().bufferSize;
     
     // Declaration and initialization of stereo buffer
     mOutputBuffer.left .resize (blockSize);
     mOutputBuffer.right.resize (blockSize);
-    // Load HRTF
     
     auto loadedHrtf = getHrtfPath();
     
@@ -74,9 +82,7 @@ void AnechoicProcessor::setup (double sampleRate)
             int index = hrtfPathToBundledIndex (loadedHrtf);
             
             if (index >= 0)
-            {
                 loadHRTF (getBundledHRTF (index, sampleRate));
-            }
         }
         
         mSampleRate = sampleRate;
@@ -87,36 +93,17 @@ void AnechoicProcessor::setup (double sampleRate)
     loadHRTF (getBundledHRTF (0, sampleRate));
     
     mSampleRate = sampleRate;
-    
-    JUCE_ASSERT_MESSAGE_MANAGER_EXISTS;
-    startTimerHz (2);
-    
-    timerCallback();
-}
-
-void AnechoicProcessor::timerCallback()
-{
-    if (mHRTFsToLoad.size() > 0)
-    {
-        if (isLoading.load())
-            return;
-
-        auto path = mHRTFsToLoad[0];
-        reset (path);
-        
-        mHRTFsToLoad.removeAllInstancesOf (path);
-    }
 }
 
-void AnechoicProcessor::reset (const File& hrtf)
+bool AnechoicProcessor::loadHRTF (const File& hrtf)
 {
     isLoading.store (true);
     
     if (! hrtf.existsAsFile())
     {
         DBG ("HRTF file doesn't exist");
         isLoading.store (false);
-        return;
+        return false;
     }
     
     __loadHRTF(hrtf);
@@ -129,7 +116,7 @@ void AnechoicProcessor::reset (const File& hrtf)
     {
         DBG ("HRTF ILD file doesn't exist");
         isLoading.store (false);
-        return;
+        return false;
     }
     
     __loadHRTF_ILD (hrtfILD);
@@ -139,19 +126,22 @@ void AnechoicProcessor::reset (const File& hrtf)
     if (! nearFieldConf.existsAsFile() ) {
         DBG ("Near field ILD file doesn't exist");
         isLoading.store (false);
-        return;
+        return false;
     }
 
 
     DBG("Loading ILD (near field): " + nearFieldConf.getFullPathName());
     if ( !ILD::CreateFrom3dti_ILDNearFieldEffectTable( nearFieldConf.getFullPathName().toStdString(), mListener )) {
         DBG ("Unable to load ILD Near Field Effect simulation file. Near (ILD) will not work");
+        return false;
     }
     
     // Re-enable processing
     isLoading.store (false);
     
     sendChangeMessage();
+    
+    return true;
 }
 
 void AnechoicProcessor::processBlock (AudioBuffer<float>& monoIn, AudioBuffer<float>& stereoOut)
@@ -215,7 +205,7 @@ void AnechoicProcessor::parameterChanged (const String& parameterID, float newVa
     {
         String fileTypes = index == BundledHRTFs.size() ? "*.sofa" : "*.3dti-hrtf";
         
-        loadCustomHrtf (fileTypes, [this] (File hrtf) {
+        loadCustomHRTF (fileTypes, [this] (File hrtf) {
             loadHRTF (hrtf);
         });
     }
@@ -265,14 +255,6 @@ void AnechoicProcessor::updateParameters()
     mCore.SetMagnitudes(magnitudes);
 }
 
-bool AnechoicProcessor::loadHRTF (const File& file)
-{
-    if (file == hrtfPath)
-        return false;
-    
-    return mHRTFsToLoad.addIfNotAlreadyThere (file);
-}
-
 bool AnechoicProcessor::__loadHRTF (const File& file)
 {
     DBG("Loading HRTF: " << file.getFullPathName());
@@ -333,7 +315,7 @@ void AnechoicProcessor::addSoundSource (const Common::CVector3& position) {
     mTransforms.back().SetPosition (Common::CVector3 (1,0,0));
 }
 
-void AnechoicProcessor::loadCustomHrtf (String fileTypes, std::function<void(File)> callback)
+void AnechoicProcessor::loadCustomHRTF (String fileTypes, std::function<void(File)> callback)
 {
     fc.reset (new FileChooser ("Choose a file to open...",
                                HRTFDirectory(),
diff --git a/Source/Binaural/AnechoicProcessor.h b/Source/Binaural/AnechoicProcessor.h
@@ -30,8 +30,7 @@ using CMonoBufferPair  = Common::CEarPair<CMonoBuffer<float>>;
 void copySourceSettings(CSingleSourceRef oldSource, CSingleSourceRef newSource);
 
 class AnechoicProcessor   : public  ChangeBroadcaster,
-                            public  AudioProcessorValueTreeState::Listener,
-                            private Timer
+                            public  AudioProcessorValueTreeState::Listener
 {
 public:
     //============================================================================
@@ -80,22 +79,20 @@ class AnechoicProcessor   : public  ChangeBroadcaster,
     
     inline Common::CVector3 getSourcePosition (int index = 0)
     {
-        if (index > mSources.size() - 1)
-            return Common::CVector3();
+        if (index > (int)mSources.size() - 1)
+            return Common::CVector3 (0, 1, 0);
         
         return mTransforms[index].GetPosition();
     }
     
     inline Common::CVector3 getSourcePosition (CSingleSourceRef source)
     {
         if (mSources.empty())
-            return Common::CVector3();
+            return Common::CVector3 (0, 1, 0);
         
         return getSourcePosition (0);
     }
     
-    void timerCallback() override;
-    
     //==========================================================================
     AudioParameterBool enableCustomizedITD;
     AudioParameterInt  headCircumference;
@@ -114,12 +111,10 @@ class AnechoicProcessor   : public  ChangeBroadcaster,
 private:
     //============================================================================
     void updateParameters();
-    
-    void reset(const File& hrtf);
     bool __loadHRTF (const File& file);
     bool __loadHRTF_ILD (const File& file);
-    bool loadResourceFile(const File& file);
-    void loadCustomHrtf (String fileTypes, std::function<void(File)> chosen);
+    bool loadResourceFile (const File& file);
+    void loadCustomHRTF (String fileTypes, std::function<void(File)> chosen);
     
     //============================================================================
     double mSampleRate;
@@ -129,8 +124,6 @@ class AnechoicProcessor   : public  ChangeBroadcaster,
     std::vector<CSingleSourceRef>           mSources;
     std::vector<Common::CTransform>         mTransforms;
     
-    Array<File, CriticalSection>            mHRTFsToLoad;
-    
     File hrtfPath;
     std::unique_ptr<FileChooser> fc;
 };
diff --git a/Source/Binaural/ReverbProcessor.cpp b/Source/Binaural/ReverbProcessor.cpp
@@ -25,8 +25,7 @@
 
 //==============================================================================
 ReverbProcessor::ReverbProcessor (Binaural::CCore& core)
-  :  Thread ("ReverbProcessor")
-  ,  reverbEnabled ("Reverb Enabled", "Reverb Enabled", true)
+  :  reverbEnabled ("Reverb Enabled", "Reverb Enabled", true)
   ,  reverbLevel ("Reverb Level", "Reverb Level", NormalisableRange<float> (-30.f, 6.f, 0.1f), -3.f)
   ,  reverbOrder ("Reverb Order", "Reverb Order", 0, 2, 1)
   ,  reverbBRIR ("Reverb BRIR", "Reverb BRIR", 0, BundledBRIRs.size() + 1, 0)
@@ -42,8 +41,6 @@ ReverbProcessor::ReverbProcessor (Binaural::CCore& core)
 ReverbProcessor::~ReverbProcessor()
 {
     reverbBRIR.removeListener (this);
-    
-    stopThread (500);
 }
 
 //==============================================================================
@@ -139,40 +136,12 @@ void ReverbProcessor::process (AudioBuffer<float>& quadIn, AudioBuffer<float>& s
     mPower = stereoOut.getRMSLevel (0, 0, numSamples);
 }
 
-//==============================================================================
-bool ReverbProcessor::loadBRIR (const File& file)
-{
-    if (file == mBRIRPath)
-        return false;
-    
-    mBRIRsToLoad.clearQuick();
-    mBRIRsToLoad.add (file);
-
-    startThread();
-    
-    return true;
-}
-
 //==============================================================================
 StringArray ReverbProcessor::getBRIROptions()
 {
     return {"Small", "Medium", "Large", "Library", "Trapezoid", "Load File ..."};
 }
 
-//==============================================================================
-void ReverbProcessor::run()
-{
-    if (mBRIRsToLoad.size() > 0 && ! isLoading.load())
-    {
-        doLoadBRIR (mBRIRsToLoad.removeAndReturn (0));
-        
-        if (mBRIRsToLoad.isEmpty())
-            signalThreadShouldExit();
-    }
-    
-    sleep (100);
-}
-
 //==============================================================================
 void ReverbProcessor::handleAsyncUpdate()
 {
@@ -223,7 +192,7 @@ void ReverbProcessor::parameterGestureChanged (int parameterIndex, bool gestureI
 }
 
 //==============================================================================
-bool ReverbProcessor::doLoadBRIR (const File& file)
+bool ReverbProcessor::loadBRIR (const File& file)
 {
     isLoading.store (true);
     
diff --git a/Source/Binaural/ReverbProcessor.h b/Source/Binaural/ReverbProcessor.h
@@ -25,7 +25,6 @@
 
 //==============================================================================
 class ReverbProcessor  : public  ChangeBroadcaster,
-                         private Thread,
                          private AsyncUpdater,
                          private AudioProcessorParameter::Listener
 {
@@ -77,9 +76,6 @@ class ReverbProcessor  : public  ChangeBroadcaster,
     
 private:
     //==========================================================================
-    /** Thread */
-    void run() override;
-    
     /** AsyncUpdater */
     void handleAsyncUpdate() override;
     
@@ -88,8 +84,6 @@ class ReverbProcessor  : public  ChangeBroadcaster,
     void parameterGestureChanged (int parameterIndex, bool gestureIsStarting) override;
     
     //==========================================================================
-    bool doLoadBRIR (const File& file);
-    
     void resetBRIRIndex();
     
     void updateParameters();
@@ -103,7 +97,6 @@ class ReverbProcessor  : public  ChangeBroadcaster,
     std::shared_ptr<Binaural::CEnvironment> mEnvironment;
     
     File mBRIRPath;
-    Array<File, CriticalSection> mBRIRsToLoad;
     std::unique_ptr<FileChooser> fc;
     
     float mPower;
diff --git a/Source/Binaural/SpatialisePluginProcessor.cpp b/Source/Binaural/SpatialisePluginProcessor.cpp
@@ -56,9 +56,7 @@ Toolkit3dtiPluginAudioProcessor::Toolkit3dtiPluginAudioProcessor()
       inFifo (2, 512),
       outFifo(2, 512)
 {
-  auto position = Common::CVector3 (0, 1, 0);
-    
-  mSpatialiser.addSoundSource (position);
+  auto position = mSpatialiser.getSourcePosition();
   
   using Parameter = AudioProcessorValueTreeState::Parameter;
   treeState.createAndAddParameter (std::make_unique<Parameter> ("Azimuth", "Azimuth", "", NormalisableRange<float> (-180.f, 180.f), position.GetAzimuthDegrees(), [](float value) { return String (value, 1); }, nullptr));
