Make reverb buffers protected members

Author: dingodoppelt

src/clientsettingsdlg.cpp

@@ -382,9 +382,9 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
 
     // reverb preset
     QString strReverbPreset = "<b>" + tr ( "Reverb Preset" ) + ":</b> " +
-                            tr ( "Jamulus uses MVerb by Martin Eastwood for reverberation. "
-                                 "MVerb comes with a set of presets you can select here. "
-                                 "Available Presets: Subtle, Stadium, Cupboard, Dark, Halves " );
+                              tr ( "Jamulus uses MVerb by Martin Eastwood for reverberation. "
+                                   "MVerb comes with a set of presets you can select here. "
+                                   "Available Presets: Subtle, Stadium, Cupboard, Dark, Halves " );
     lblInputBoost->setWhatsThis ( strReverbPreset );
     cbxInputBoost->setWhatsThis ( strReverbPreset );
     cbxInputBoost->setAccessibleName ( tr ( "Reverb Preset combo box" ) );
@@ -1412,10 +1412,7 @@ void CClientSettingsDlg::OnInputBoostChanged()
     pClient->SetInputBoost ( pSettings->iInputBoost );
 }
 
-void CClientSettingsDlg::OnReverbPresetChanged()
-{
-    pClient->SetReverbPreset ( cbxReverbPreset->currentIndex() );
-}
+void CClientSettingsDlg::OnReverbPresetChanged() { pClient->SetReverbPreset ( cbxReverbPreset->currentIndex() ); }
 
 void CClientSettingsDlg::OnAliasTextChanged ( const QString& strNewName )
 {

src/plugins/audioreverb.cpp

@@ -13,26 +13,30 @@ void CAudioReverb::Init ( const EAudChanConf eNAudioChannelConf, const int iNSte
 {
     eAudioChannelConf   = eNAudioChannelConf;
     iStereoBlockSizeSam = iNStereoBlockSizeSam;
+
+    // Jamulus uses interleaved stereo, mverb operates on a 2-dimensional array instead
+    // Calculate the number of frames for each channel ( iStereoBlockSizeSam / 2 )
+    numFrames = iStereoBlockSizeSam >> 1;
+
+    // These buffers get filled with dry signal and are then passed to mverb
+    // They need to be vectors as the windows builds fail when arrays are used
+    bufL.resize ( numFrames );
+    bufR.resize ( numFrames );
+
+    mverb->setSampleRate ( static_cast<float> ( SYSTEM_SAMPLE_RATE_HZ ) );
+    loadPreset();
 }
 
 void CAudioReverb::loadPreset()
 {
     for ( int i = 0; i < MVerb<float>::NUM_PARAMS; i++ )
     {
-        mverb.setParameter ( i, presets[iPreset][i] );
+        mverb->setParameter ( i, presets[iPreset][i] );
     }
 }
 
 void CAudioReverb::Process ( CVector<int16_t>& vecsStereoInOut, const bool bReverbOnLeftChan, const float fReverbGain )
 {
-    // Jamulus uses interleaved stereo, mverb operates on a 2-dimensional array instead
-    // Calculate the number of frames for each channel ( iStereoBlockSizeSam / 2 )
-    const int numFrames = iStereoBlockSizeSam >> 1;
-
-    // These buffers get filled with dry signal and are then passed to mverb
-    // They need to be vectors as the windows builds fail when arrays are used
-    std::vector<float> bufL ( numFrames );
-    std::vector<float> bufR ( numFrames );
 
     // One buffer to pass to mverb's process function
     float* fInput[2] = { bufL.data(), bufR.data() };
@@ -55,7 +59,7 @@ void CAudioReverb::Process ( CVector<int16_t>& vecsStereoInOut, const bool bReve
         }
     }
 
-    mverb.process ( fInput, fInput, numFrames );
+    mverb->process ( fInput, fInput, numFrames );
 
     for ( int i = 0, j = 0; j < numFrames; i += 2, j++ )
     {

src/plugins/audioreverb.h

@@ -16,9 +16,12 @@ class CAudioReverb
 public:
     CAudioReverb()
     {
-        mverb.setSampleRate ( static_cast<float> ( SYSTEM_SAMPLE_RATE_HZ ) );
         fMaxShort = static_cast<float> ( _MAXSHORT );
         iPreset   = STADIUM;
+
+        // Create MVerb on the heap
+        mverb = std::unique_ptr<MVerb<float>> ( new MVerb<float>() );
+        mverb->setSampleRate ( SYSTEM_SAMPLE_RATE_HZ );
         loadPreset();
     }
 
@@ -38,14 +41,18 @@ class CAudioReverb
     int getPreset() const { return iPreset; };
 
 protected:
-    MVerb<float> mverb;
+    std::unique_ptr<MVerb<float>> mverb;
 
     void         loadPreset();
     EAudChanConf eAudioChannelConf;
     int          iStereoBlockSizeSam;
     float        fMaxShort;
     int          iPreset;
 
+    int                numFrames;
+    std::vector<float> bufL;
+    std::vector<float> bufR;
+
     enum
     {
         SUBTLE          = 0,