refactor: replace FIREqualizer with MultimodalEqualizer

Author: timschneeb

src/MainWindow.ui

@@ -74,7 +74,7 @@
          <item>
           <widget class="QStackedWidget" name="tabhost">
            <property name="currentIndex">
-            <number>0</number>
+            <number>3</number>
            </property>
            <widget class="QWidget" name="tabHostPage1">
             <layout class="QVBoxLayout" name="verticalLayout_6">
@@ -1257,12 +1257,32 @@
                  </property>
                  <item>
                   <property name="text">
-                   <string>Minimum phase</string>
+                   <string>FIR Minimum phase</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
-                   <string>Linear phase</string>
+                   <string>IIR 4 order</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>IIR 6 order</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>IIR 8 order</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>IIR 10 order</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>IIR 12 order</string>
                   </property>
                  </item>
                 </widget>

src/audio/base/DspHost.cpp

@@ -144,7 +144,7 @@ void DspHost::updateFirEqualizer(DspConfig *config)
         param[i] = (double)std::stod(v[i]);
     }
 
-    // TODO FIREqualizerAxisInterpolation(cast(this->_dsp), interpolationMode, filterType, param, param + 15);
+    MultimodalEqualizerAxisInterpolation(cast(this->_dsp), interpolationMode, filterType, param, param + 15);
 }
 
 void DspHost::updateVdc(DspConfig *config)
@@ -593,10 +593,10 @@ bool DspHost::update(DspConfig *config, bool ignoreCache)
             }
             break;
         case DspConfig::tone_enable:
-            /*if(current.toBool())
-                FIREqualizerEnable(cast(this->_dsp));
+            if(current.toBool())
+                MultimodalEqualizerDisable(cast(this->_dsp));
             else
-                FIREqualizerDisable(cast(this->_dsp));*/ //TODO
+                MultimodalEqualizerEnable(cast(this->_dsp), 1);
             break;
         case DspConfig::tone_eq:
         case DspConfig::tone_filtertype:

src/audio/pipewire/PipewireAudioService.cpp

@@ -16,11 +16,9 @@ PipewireAudioService::PipewireAudioService()
 
     mgr = std::make_unique<PwPipelineManager>();
     appMgr = std::make_unique<PwAppManager>(mgr.get());
-    plugin = new PwJamesDspPlugin(mgr.get());
+    plugin = new PwJamesDspPlugin(mgr.get(), this);
     effects = std::make_unique<FilterContainer>(mgr.get(), plugin, &AppConfig::instance());
 
-    plugin->setMessageHandler(std::bind(&IAudioService::handleMessage, this, std::placeholders::_1, std::placeholders::_2));
-
     mgr.get()->new_default_sink_name.connect([=](const std::string& name) {
         util::debug("new default output device: " + name);
 

src/audio/pipewire/PwJamesDspPlugin.cpp

@@ -12,9 +12,10 @@ void receivePrintfStdout(const char* msg, void* userdata) {
     }
 }
 
-PwJamesDspPlugin::PwJamesDspPlugin(PwPipelineManager* pipe_manager)
+PwJamesDspPlugin::PwJamesDspPlugin(PwPipelineManager* pipe_manager, IAudioService* parent_service)
     : PwPluginBase("@PwJamesDspPlugin: ", "JamesDsp", pipe_manager)
 {
+    setMessageHandler(std::bind(&IAudioService::handleMessage, parent_service, std::placeholders::_1, std::placeholders::_2));
     setPrintfStdOutHandler(receivePrintfStdout, this);
 
     this->dsp = (JamesDSPLib*) malloc(sizeof(JamesDSPLib));

src/audio/pipewire/PwJamesDspPlugin.h

@@ -3,15 +3,15 @@
 
 #include "PwBasePlugin.h"
 #include "IDspElement.h"
+#include "IAudioService.h"
 
 extern "C" {
 #include "jdsp_header.h"
 }
 
-
 class PwJamesDspPlugin : public PwPluginBase, public IDspElement {
 public:
-  PwJamesDspPlugin(PwPipelineManager* pipe_manager);
+  PwJamesDspPlugin(PwPipelineManager* pipe_manager, IAudioService* parent_service);
   PwJamesDspPlugin(const PwJamesDspPlugin&) = delete;
   auto operator=(const PwJamesDspPlugin&) -> PwJamesDspPlugin& = delete;
   PwJamesDspPlugin(const PwJamesDspPlugin&&) = delete;