jamulussoftware · dingodoppelt · Jul 17, 2026 · Aug 9, 2026 · Aug 10, 2026 · Aug 10, 2026
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "libs/oboe"]
 	path = libs/oboe
 	url = ../../google/oboe.git
+[submodule "libs/mverb"]
+	path = libs/mverb
+	url = https://github.com/martineastwood/mverb.git
diff --git a/COMPILING.md b/COMPILING.md
@@ -205,3 +205,4 @@ During compile time some CONFIG arguments can be given to enable or disable spec
 | `disable_version_check` | Skip checks for version updates                                         |
 | `noupcasename`          | Compile Jamulus binary as lower case "jamulus" instead of "Jamulus"     |
 | `raspijamulus`          | Use raspijamulus.sh specific enhancements for build on Raspberry Pi     |
+| `noreverb`              | Don't build the internal reverb and disable all related GUI elements    |
diff --git a/Jamulus.pro b/Jamulus.pro
@@ -42,6 +42,20 @@ contains(CONFIG, "nosound") {
     warning("\"nosound\" is deprecated: please use \"serveronly\" for a server-only build.")
 }
 
+contains(CONFIG, "serveronly") | contains(CONFIG, "noreverb") {
+    message("building without reverb plugin")
+    DEFINES += NO_REVERB
+} else {
+    !exists($$PWD/libs/mverb/MVerb.h) {
+        !system("git -C $$PWD submodule update --init --force libs/mverb") {
+            error('MVerb not found and could not be cloned as a submodule.$$escape_expand(\n) \
+                   Try cloning MVerb manually with: \'git submodule update --init --force libs/mverb\'$$escape_expand(\n) \
+                   To disable the reverb plugin call QMake with "CONFIG+=noreverb"$$escape_expand(\n)Exiting...')
+        }
+    }
+    message("building with MVerb")
+}
+
 contains(CONFIG, "headless") {
     message(Headless mode activated.)
     QT -= gui
@@ -90,6 +104,8 @@ DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
 DEFINES += QT_NO_DEPRECATED_WARNINGS
 
 win32 {
+    # fixes error C7525: inline variables require at least '/std:c++17'
+    CONFIG += c++17
     DEFINES -= UNICODE # fixes issue with ASIO SDK (asiolist.cpp is not unicode compatible)
     DEFINES += NOMINMAX # solves a compiler error in qdatetime.h (Qt5)
     RC_FILE = src/res/win-mainicon.rc
@@ -388,8 +404,7 @@ FORMS_GUI = src/aboutdlgbase.ui \
         src/connectdlgbase.ui
 }
 
-HEADERS += src/plugins/audioreverb.h \
-    src/buffer.h \
+HEADERS += src/buffer.h \
     src/channel.h \
     src/global.h \
     src/protocol.h \
@@ -410,6 +425,10 @@ HEADERS += src/plugins/audioreverb.h \
     HEADERS += src/client.h \
         src/sound/soundbase.h \
         src/testbench.h
+    !contains(CONFIG, noreverb) {
+        HEADERS += src/plugins/audioreverb.h \
+            libs/mverb/MVerb.h
+    }
 }
 
 HEADERS_GUI = src/serverdlg.h
@@ -496,8 +515,7 @@ HEADERS_OPUS_X86 = libs/opus/celt/x86/celt_lpc_sse.h \
     libs/opus/celt/x86/x86cpu.h \
     $$files(libs/opus/silk/x86/*.h)
 
-SOURCES += src/plugins/audioreverb.cpp \
-    src/buffer.cpp \
+SOURCES += src/buffer.cpp \
     src/channel.cpp \
     src/main.cpp \
     src/protocol.cpp \
@@ -515,7 +533,10 @@ SOURCES += src/plugins/audioreverb.cpp \
 
 !contains(CONFIG, "serveronly") {
     SOURCES += src/client.cpp \
-        src/sound/soundbase.cpp \
+        src/sound/soundbase.cpp
+    !contains(CONFIG, "noreverb") {
+        SOURCES += src/plugins/audioreverb.cpp
+    }
 }
 
 SOURCES_GUI = src/serverdlg.cpp

diff --git a/libs/mverb b/libs/mverb
diff --git a/src/client.cpp b/src/client.cpp
@@ -76,8 +76,10 @@ CClient::CClient ( const quint16  iPortNumber,
     Socket ( &Channel, iPortNumber, iQosNumber, "", "", bNDisableIPv6, bIPv6Available ),
     Sound ( AudioCallback, this, bNoAutoJackConnect, strNClientName ),
     iAudioInFader ( AUD_FADER_IN_MIDDLE ),
+#ifndef NO_REVERB
     bReverbOnLeftChan ( false ),
     iReverbLevel ( 0 ),
+#endif
     iInputBoost ( 1 ),
     iSndCrdPrefFrameSizeFactor ( FRAME_SIZE_FACTOR_DEFAULT ),
     iSndCrdFrameSizeFactor ( FRAME_SIZE_FACTOR_DEFAULT ),
@@ -1460,10 +1462,10 @@ void CClient::Init()
 
     // set the channel network properties
     Channel.SetAudioStreamProperties ( eAudioCompressionType, iCeltNumCodedBytes, iSndCrdFrameSizeFactor, iNumAudioChannels );
-
+#ifndef NO_REVERB
     // init reverberation
-    AudioReverb.Init ( eAudioChannelConf, iStereoBlockSizeSam, SYSTEM_SAMPLE_RATE_HZ );
-
+    AudioReverb.Init ( eAudioChannelConf, iStereoBlockSizeSam );
+#endif
     // init the sound card conversion buffers
     if ( bSndCrdConversionBufferRequired )
     {
@@ -1555,13 +1557,13 @@ void CClient::ProcessAudioDataIntern ( CVector<int16_t>& vecsStereoSndCrd )
 #ifndef HEADLESS
     SignalLevelMeter.Update ( vecsStereoSndCrd, iMonoBlockSizeSam, true );
 #endif
-
+#ifndef NO_REVERB
     // add reverberation effect if activated
     if ( iReverbLevel != 0 )
     {
         AudioReverb.Process ( vecsStereoSndCrd, bReverbOnLeftChan, static_cast<float> ( iReverbLevel ) / AUD_REVERB_MAX / 4 );
     }
-
+#endif
     // apply pan (audio fader) and mix mono signals
     if ( !( ( iAudioInFader == AUD_FADER_IN_MIDDLE ) && ( eAudioChannelConf == CC_STEREO ) ) )
     {

diff --git a/src/client.h b/src/client.h
@@ -61,7 +61,9 @@
 #include "socket.h"
 #include "channel.h"
 #include "util.h"
-#include "plugins/audioreverb.h"
+#ifndef NO_REVERB
+#    include "plugins/audioreverb.h"
+#endif
 #include "buffer.h"
 #include "signalhandler.h"
 
@@ -206,17 +208,15 @@ class CClient : public QObject
 
     int  GetAudioInFader() const { return iAudioInFader; }
     void SetAudioInFader ( const int iNV ) { iAudioInFader = iNV; }
-
+#ifndef NO_REVERB
     int  GetReverbLevel() const { return iReverbLevel; }
+    int  GetReverbPreset() const { return AudioReverb.getPreset(); }
     void SetReverbLevel ( const int iNL ) { iReverbLevel = iNL; }
+    void SetReverbPreset ( const int iNP ) { AudioReverb.setPreset ( iNP ); }
 
     bool IsReverbOnLeftChan() const { return bReverbOnLeftChan; }
-    void SetReverbOnLeftChan ( const bool bIL )
-    {
-        bReverbOnLeftChan = bIL;
-        AudioReverb.Clear();
-    }
-
+    void SetReverbOnLeftChan ( const bool bIL ) { bReverbOnLeftChan = bIL; }
+#endif
     void SetDoAutoSockBufSize ( const bool bValue );
     bool GetDoAutoSockBufSize() const { return Channel.GetDoAutoSockBufSize(); }
 
@@ -431,11 +431,13 @@ class CClient : public QObject
 
     CVector<uint8_t> vecbyNetwData;
 
-    std::atomic<int>  iAudioInFader;
-    std::atomic<bool> bReverbOnLeftChan;
-    std::atomic<int>  iReverbLevel;
-    CAudioReverb      AudioReverb;
-    std::atomic<int>  iInputBoost;
+    int iAudioInFader;
+#ifndef NO_REVERB
+    bool         bReverbOnLeftChan;
+    int          iReverbLevel;
+    CAudioReverb AudioReverb;
+#endif
+    int iInputBoost;
 
     int iSndCrdPrefFrameSizeFactor;
     int iSndCrdFrameSizeFactor;

diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
@@ -116,7 +116,7 @@ CClientDlg::CClientDlg ( CClient*         pNCliP,
                                     "If you are connected, pressing this button will end the session." ) );
 
     butConnect->setAccessibleName ( tr ( "Connect and disconnect toggle button" ) );
-
+#ifndef NO_REVERB
     // reverberation level
     QString strAudReverb = "<b>" + tr ( "Reverb effect" ) + ":</b> " +
                            tr ( "Reverb can be applied to one local mono audio channel or to both "
@@ -142,7 +142,13 @@ CClientDlg::CClientDlg ( CClient*         pNCliP,
     rbtReverbSelL->setAccessibleName ( tr ( "Left channel selection for reverb" ) );
     rbtReverbSelR->setWhatsThis ( strRevChanSel );
     rbtReverbSelR->setAccessibleName ( tr ( "Right channel selection for reverb" ) );
-
+#endif
+#ifdef NO_REVERB
+    lblAudioReverb->setVisible ( false );
+    sldAudioReverb->setVisible ( false );
+    rbtReverbSelL->setVisible ( false );
+    rbtReverbSelR->setVisible ( false );
+#endif
     // delay LED
     QString strLEDDelay = "<b>" + tr ( "Delay Status LED" ) + ":</b> " + tr ( "Shows the current audio delay status:" ) +
                           "<ul>"
@@ -256,19 +262,20 @@ CClientDlg::CClientDlg ( CClient*         pNCliP,
     // init status LEDs
     ledBuffers->Reset();
     ledDelay->Reset();
-
+#ifndef NO_REVERB
     // init audio reverberation
     sldAudioReverb->setRange ( 0, AUD_REVERB_MAX );
     const int iCurAudReverb = pClient->GetReverbLevel();
     sldAudioReverb->setValue ( iCurAudReverb );
     sldAudioReverb->setTickInterval ( AUD_REVERB_MAX / 5 );
+#endif
+
+    // init reverb channel (needed for pan feature as well)
+    UpdateRevSelection();
 
     // init input boost
     pClient->SetInputBoost ( pSettings->iInputBoost );
 
-    // init reverb channel
-    UpdateRevSelection();
-
     // init connect dialog
     ConnectDlg.SetShowAllMusicians ( pSettings->bConnectDlgShowAllMusicians );
 
@@ -487,14 +494,14 @@ CClientDlg::CClientDlg ( CClient*         pNCliP,
     QObject::connect ( &TimerCheckAudioDeviceOk, &QTimer::timeout, this, &CClientDlg::OnTimerCheckAudioDeviceOk );
 
     QObject::connect ( &TimerDetectFeedback, &QTimer::timeout, this, &CClientDlg::OnTimerDetectFeedback );
-
+#ifndef NO_REVERB
     QObject::connect ( sldAudioReverb, &QSlider::valueChanged, this, &CClientDlg::OnAudioReverbValueChanged );
 
     // radio buttons
     QObject::connect ( rbtReverbSelL, &QRadioButton::clicked, this, &CClientDlg::OnReverbSelLClicked );
 
     QObject::connect ( rbtReverbSelR, &QRadioButton::clicked, this, &CClientDlg::OnReverbSelRClicked );
-
+#endif
     // other
     QObject::connect ( pClient, &CClient::ConClientListMesReceived, this, &CClientDlg::OnConClientListMesReceived );
 
@@ -682,9 +689,9 @@ void CClientDlg::ManageDragNDrop ( QDropEvent* Event, const bool bCheckAccept )
         }
     }
 }
-
 void CClientDlg::UpdateRevSelection()
 {
+#ifndef NO_REVERB
     if ( pClient->GetAudioChannels() == CC_STEREO )
     {
         // for stereo make channel selection invisible since
@@ -708,11 +715,10 @@ void CClientDlg::UpdateRevSelection()
             rbtReverbSelR->setChecked ( true );
         }
     }
-
+#endif
     // update visibility of the pan controls in the audio mixer board (pan is not supported for mono)
     MainMixerBoard->SetDisplayPans ( pClient->GetAudioChannels() != CC_MONO );
 }
-
 void CClientDlg::OnConnectDlgAccepted()
 {
     // We had an issue that the accepted signal was emit twice if a list item was double
@@ -1361,7 +1367,8 @@ void CClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )
             "                         image:          url(:/png/fader/res/ledbuttonpressed.png); }"
             "QCheckBox {              color:          rgb(220, 220, 220);"
             "                         font:           bold; }" );
-#ifdef _WIN32
+#ifndef NO_REVERB
+#    ifdef _WIN32
         // Workaround QT-Windows problem: This should not be necessary since in the
         // background frame the style sheet for QRadioButton was already set. But it
         // seems that it is only applied if the style was set to default and then back
@@ -1370,6 +1377,7 @@ void CClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )
                                        "font:  bold;" );
         rbtReverbSelR->setStyleSheet ( "color: rgb(220, 220, 220);"
                                        "font:  bold;" );
+#    endif
 #endif
 
         ledBuffers->SetType ( CMultiColorLED::MT_LED );
@@ -1380,10 +1388,12 @@ void CClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )
         // reset style sheet and set original parameters
         backgroundFrame->setStyleSheet ( "" );
 
-#ifdef _WIN32
+#ifndef NO_REVERB
+#    ifdef _WIN32
         // Workaround QT-Windows problem: See above description
         rbtReverbSelL->setStyleSheet ( "" );
         rbtReverbSelR->setStyleSheet ( "" );
+#    endif
 #endif
 
         ledBuffers->SetType ( CMultiColorLED::MT_INDICATOR );

diff --git a/src/clientdlg.h b/src/clientdlg.h
@@ -201,13 +201,13 @@ public slots:
     void OnSettingsStateChanged ( int value );
     void OnChatStateChanged ( int value );
     void OnLocalMuteStateChanged ( int value );
-
+#ifndef NO_REVERB
     void OnAudioReverbValueChanged ( int value ) { pClient->SetReverbLevel ( value ); }
 
     void OnReverbSelLClicked() { pClient->SetReverbOnLeftChan ( true ); }
 
     void OnReverbSelRClicked() { pClient->SetReverbOnLeftChan ( false ); }
-
+#endif
     void OnFeedbackDetectionChanged ( int state ) { ClientSettingsDlg.SetEnableFeedbackDetection ( state == Qt::Checked ); }
 
     void OnConClientListMesReceived ( CVector<CChannelInfo> vecChanInfo );

diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp
@@ -379,7 +379,21 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
     lblInputBoost->setWhatsThis ( strInputBoost );
     cbxInputBoost->setWhatsThis ( strInputBoost );
     cbxInputBoost->setAccessibleName ( tr ( "Input Boost combo box" ) );
-
+#ifndef NO_REVERB
+    // 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, Drum Room, Club " );
+    lblReverbPreset->setWhatsThis ( strReverbPreset );
+    cbxReverbPreset->setWhatsThis ( strReverbPreset );
+    cbxReverbPreset->setAccessibleName ( tr ( "Reverb Preset combo box" ) );
+#endif
+#ifdef NO_REVERB
+    lblReverbPreset->setVisible ( false );
+    cbxReverbPreset->setVisible ( false );
+    verticalSpacer_13->changeSize ( 0, 0 );
+#endif
     // custom directories
     QString strCustomDirectories = "<b>" + tr ( "Custom Directories" ) + ":</b> " +
                                    tr ( "If you need to add additional directories to the Connect dialog Directory drop down, "
@@ -554,7 +568,18 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
     }
     // factor is 1-based while index is 0-based:
     cbxInputBoost->setCurrentIndex ( pSettings->iInputBoost - 1 );
-
+#ifndef NO_REVERB
+    // Rever Preset combo box
+    cbxReverbPreset->clear();
+    cbxReverbPreset->addItem ( "Subtle" );
+    cbxReverbPreset->addItem ( "Stadium" );
+    cbxReverbPreset->addItem ( "Cupboard" );
+    cbxReverbPreset->addItem ( "Dark" );
+    cbxReverbPreset->addItem ( "Halves" );
+    cbxReverbPreset->addItem ( "Drum Room" );
+    cbxReverbPreset->addItem ( "Club" );
+    cbxReverbPreset->setCurrentIndex ( pClient->GetReverbPreset() );
+#endif
     // init number of mixer rows
     spnMixerRows->setValue ( pSettings->iNumMixerPanelRows );
 
@@ -785,7 +810,12 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
                        static_cast<void ( QComboBox::* ) ( int )> ( &QComboBox::activated ),
                        this,
                        &CClientSettingsDlg::OnInputBoostChanged );
-
+#ifndef NO_REVERB
+    QObject::connect ( cbxReverbPreset,
+                       static_cast<void ( QComboBox::* ) ( int )> ( &QComboBox::activated ),
+                       this,
+                       &CClientSettingsDlg::OnReverbPresetChanged );
+#endif
     // buttons
 #if defined( _WIN32 ) && !defined( WITH_JACK )
     // Driver Setup button is only available for Windows when JACK is not used
@@ -1388,7 +1418,9 @@ void CClientSettingsDlg::OnInputBoostChanged()
     pSettings->iInputBoost = cbxInputBoost->currentIndex() + 1;
     pClient->SetInputBoost ( pSettings->iInputBoost );
 }
-
+#ifndef NO_REVERB
+void CClientSettingsDlg::OnReverbPresetChanged() { pClient->SetReverbPreset ( cbxReverbPreset->currentIndex() ); }
+#endif
 void CClientSettingsDlg::OnAliasTextChanged ( const QString& strNewName )
 {
     // check length

diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h
@@ -109,6 +109,9 @@ public slots:
     void OnCustomDirectoriesChanged ( bool bDelete );
     void OnNewClientLevelEditingFinished() { pSettings->iNewClientFaderLevel = edtNewClientLevel->text().toInt(); }
     void OnInputBoostChanged();
+#ifndef NO_REVERB
+    void OnReverbPresetChanged();
+#endif
     void OnSndCrdBufferDelayButtonGroupClicked ( QAbstractButton* button );
     void OnSoundcardActivated ( int iSndDevIdx );
     void OnLInChanActivated ( int iChanIdx );