Merge pull request #1 from 3DTune-In/develop

Develop

Author: ragnaringi

3dti_AudioToolkit_Plugin.jucer

@@ -6,7 +6,7 @@
               pluginVST3Category="Spatial" pluginRTASCategory="512" pluginAAXCategory="512"
               pluginVSTCategory="kPlugCategSpacializer" pluginAUMainType="'aupn'"
               pluginFormats="buildVST" pluginManufacturer="3D Tune-In" aaxIdentifier="eu.3d-tune-in.toolkitplugin"
-              bundleIdentifier="eu.3d-tune-in.toolkitplugin" version="1.0.0"
+              bundleIdentifier="eu.3d-tune-in.toolkitplugin" version="1.0.1"
               companyWebsite="http://3d-tune-in.eu">
   <MAINGROUP id="J6xy11" name="3D Tune-In Toolkit">
     <GROUP id="{7E66D3A7-5BFC-CA2F-8ED8-8DEFC273D8EA}" name="Resources">

Source/Toolkit3dtiProcessor.cpp

@@ -18,15 +18,14 @@
 * \b Acknowledgement: This project has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No 644051 and 726765.
 */
 
+#include <thread>
 #include "Utils.h"
 #include "Toolkit3dtiProcessor.h"
 
-std::mutex mtx;
-
 void copySourceSettings(CSingleSourceRef oldSource, CSingleSourceRef newSource);
 
-ScopedPointer<Toolkit3dtiProcessorImpl> CreateImpl(double sampleRate, int samplesPerBlock) {
-  ScopedPointer<Toolkit3dtiProcessorImpl> impl( new Toolkit3dtiProcessorImpl );
+Toolkit3dtiProcessor::Impl::Ptr CreateImpl(double sampleRate, int samplesPerBlock) {
+  Toolkit3dtiProcessor::Impl::Ptr impl( new Toolkit3dtiProcessor::Impl );
 
   // Declaration and initialization of stereo buffer
   impl->mOutputBuffer.left.resize(samplesPerBlock);
@@ -96,10 +95,10 @@ void Toolkit3dtiProcessor::setup(double sampleRate, int samplesPerBlock) {
   int brirIndex = pimpl ? pimpl->brirIndex : 0;
   File brir = getBundledBRIR(brirIndex, sampleRate);
 
-  reset(impl, hrtf, brir);
+  reset(std::move(impl), hrtf, brir);
 }
 
-void Toolkit3dtiProcessor::reset(ScopedPointer<Toolkit3dtiProcessorImpl> impl, const File& hrtf, const File& brir) {
+void Toolkit3dtiProcessor::reset(Impl::Ptr impl, const File& hrtf, const File& brir) {
   if ( !hrtf.existsAsFile() ) {
     DBG("HRTF file doesn't exist");
   }
@@ -132,7 +131,7 @@ void Toolkit3dtiProcessor::reset(ScopedPointer<Toolkit3dtiProcessorImpl> impl, c
 
   // Add a sound source
   auto position = getSourcePosition();
-  addSoundSource(*impl, position);
+  addSoundSource(*impl.get(), position);
 
   if ( pimpl != nullptr ) {
     for ( int i = 0; i < pimpl->sources.size(); i++ ) {
@@ -146,19 +145,21 @@ void Toolkit3dtiProcessor::reset(ScopedPointer<Toolkit3dtiProcessorImpl> impl, c
   while (true) {
     if ( mtx.try_lock() ) {
 
-      pimpl = impl;
+      pimpl = std::move(impl);
+      
       mtx.unlock();
       break;
 
     } else {
       // Failed to aquire lock for assigning new implementation
       // Try again
+      std::this_thread::yield();
     }
   }
 }
 
 void Toolkit3dtiProcessor::processBlock(AudioBuffer<float>& buffer, MidiBuffer& midiMessages) {
-  if ( pimpl.get() == nullptr ) {
+  if ( pimpl == nullptr ) {
     return;
   }
 
@@ -237,7 +238,7 @@ void Toolkit3dtiProcessor::processBlock(AudioBuffer<float>& buffer, MidiBuffer&
   mtx.unlock();
 }
 
-void Toolkit3dtiProcessor::updateParameters(Toolkit3dtiProcessorImpl& impl) {
+void Toolkit3dtiProcessor::updateParameters(Impl& impl) {
   if ( enableCustomizedITD ) {
     impl.mListener->EnableCustomizedITD();
   } else {
@@ -285,7 +286,7 @@ bool Toolkit3dtiProcessor::loadHRTF(const File& file) {
 }
 
 // TODO: Move to private implmentation
-bool Toolkit3dtiProcessor::loadHRTF(Toolkit3dtiProcessorImpl& impl, const File& file) {
+bool Toolkit3dtiProcessor::loadHRTF(Impl& impl, const File& file) {
   DBG("Loading HRTF: " << file.getFullPathName());
   bool success = false;
   success = loadResourceFile(impl, file, true);
@@ -298,7 +299,7 @@ bool Toolkit3dtiProcessor::loadHRTF_ILD(const File& file) {
   return loadHRTF_ILD(*pimpl, file);
 }
 
-bool Toolkit3dtiProcessor::loadHRTF_ILD(Toolkit3dtiProcessorImpl& impl, const File& file) {
+bool Toolkit3dtiProcessor::loadHRTF_ILD(Impl& impl, const File& file) {
   auto path = file.getFullPathName().toStdString();
   DBG("Loading HRTF ILD: " << path);
   auto fileSampleRate = ILD::GetSampleRateFrom3dti(path);
@@ -329,15 +330,15 @@ bool Toolkit3dtiProcessor::loadBRIR(const File& file) {
   return true;
 }
 
-bool Toolkit3dtiProcessor::loadBRIR(Toolkit3dtiProcessorImpl &impl, const File& file) {
+bool Toolkit3dtiProcessor::loadBRIR(Impl &impl, const File& file) {
   DBG("Loading BRIR: " << file.getFullPathName());
   bool success = loadResourceFile(impl, file, false);
   impl.brirIndex = brirPathToBundledIndex(file);
   impl.brirPath = file;
   return success;
 }
 
-bool Toolkit3dtiProcessor::loadResourceFile(Toolkit3dtiProcessorImpl &impl, const File& file, bool isHRTF) {
+bool Toolkit3dtiProcessor::loadResourceFile(Impl &impl, const File& file, bool isHRTF) {
   int sampleRate = impl.mCore.GetAudioState().sampleRate;
   int fileSampleRate = checkResourceSampleRate(file, isHRTF);
   // TODO: Throw exception / return error and trigger warning from editor
@@ -358,7 +359,7 @@ bool Toolkit3dtiProcessor::loadResourceFile(Toolkit3dtiProcessorImpl &impl, cons
   return false;
 }
 
-void Toolkit3dtiProcessor::addSoundSource(Toolkit3dtiProcessorImpl &impl, Common::CVector3& position) {
+void Toolkit3dtiProcessor::addSoundSource(Impl &impl, Common::CVector3& position) {
   if ( impl.sources.size() == 1 ) {
     DBG("Only one source allowed at this time.");
     return;

Source/Toolkit3dtiProcessor.h

@@ -33,20 +33,24 @@ using CEnvironmentRef = shared_ptr<Binaural::CEnvironment>;
 using CSingleSourceRef = shared_ptr<Binaural::CSingleSourceDSP>;
 using CMonoBufferPairf = Common::CEarPair<CMonoBuffer<float>>;
 
-struct Toolkit3dtiProcessorImpl {
-  Binaural::CCore                 mCore;
-  CEnvironmentRef                 mEnvironment;
-  CListenerRef                    mListener;
-  CMonoBufferPairf                mOutputBuffer;
-  std::vector<CSingleSourceRef>   sources;
-  int  hrtfIndex;
-  int  brirIndex;
-  File hrtfPath;
-  File brirPath;
-};
-
 class Toolkit3dtiProcessor {
 public:
+    
+  struct Impl {
+    using Ptr = std::unique_ptr<Impl>;
+        
+    Binaural::CCore                 mCore;
+    CEnvironmentRef                 mEnvironment;
+    CListenerRef                    mListener;
+    CMonoBufferPairf                mOutputBuffer;
+    std::vector<CSingleSourceRef>   sources;
+    int  hrtfIndex;
+    int  brirIndex;
+    File hrtfPath;
+    File brirPath;
+  };
+  
+  //============================================================================
   Toolkit3dtiProcessor();
 
   //============================================================================
@@ -101,17 +105,19 @@ class Toolkit3dtiProcessor {
   AudioParameterFloat reverbDistanceAttenuation; // ranges from -6 to 0 dB
 
 private:
+    
+  std::mutex mtx;
 
-  void reset(ScopedPointer<Toolkit3dtiProcessorImpl>, const File& hrtf, const File& brir);
-  void updateParameters(Toolkit3dtiProcessorImpl& impl);
-  void addSoundSource(Toolkit3dtiProcessorImpl& impl, Common::CVector3& position);
-  bool loadResourceFile(Toolkit3dtiProcessorImpl& impl, const File& file, bool isHRTF);
-  bool loadHRTF(Toolkit3dtiProcessorImpl& impl, const File& file);
-  bool loadHRTF_ILD(Toolkit3dtiProcessorImpl& impl, const File& file);
-  bool loadBRIR(Toolkit3dtiProcessorImpl& impl, const File& file);
+  void reset(Impl::Ptr p, const File& hrtf, const File& brir);
+  void updateParameters(Impl& impl);
+  void addSoundSource(Impl& impl, Common::CVector3& position);
+  bool loadResourceFile(Impl& impl, const File& file, bool isHRTF);
+  bool loadHRTF(Impl& impl, const File& file);
+  bool loadHRTF_ILD(Impl& impl, const File& file);
+  bool loadBRIR(Impl& impl, const File& file);
 
   //============================================================================
-  ScopedPointer<Toolkit3dtiProcessorImpl> pimpl;
+  Impl::Ptr pimpl;
 
   Common::CTransform mTransform;    // Source transform