feat: add UI support for the new compander effect

Author: timschneeb

resources/assets/default.conf

@@ -1,5 +1,10 @@
 bass_enable=false
 bass_maxgain=5
+compander_enable=false
+compander_granularity=2
+compander_timeconstant=0.22
+compander_time_freq_transforms=0
+compander_response="95.0;200.0;400.0;800.0;1600.0;3400.0;7500.0;0;0;0;0;0;0;0"
 compression_aggressiveness=800
 compression_enable=false
 compression_maxatk=30

src/MainWindow.cpp

@@ -155,8 +155,8 @@ MainWindow::MainWindow(bool     statupInTray,
         onConvolverInfoChanged(ciArgs);
         connect(_audioService, &IAudioService::convolverInfoChanged, this, &MainWindow::onConvolverInfoChanged);
 
-       _eelEditor->attachHost(_audioService);
-       connect(_eelEditor, &EELEditor::executionRequested, [this](QString path){
+        _eelEditor->attachHost(_audioService);
+        connect(_eelEditor, &EELEditor::executionRequested, [this](QString path){
             if (QFileInfo::exists(path) && QFileInfo(path).isFile())
             {
                 ui->liveprog->setCurrentLiveprog(path);
@@ -319,6 +319,7 @@ MainWindow::MainWindow(bool     statupInTray,
     {
         _styleHelper->SetStyle();
         ui->eq_widget->setAccentColor(palette().highlight().color());
+        ui->comp_response->setAccentColor(palette().highlight().color());
     }
 
     // Extract default EEL files if missing
@@ -379,6 +380,7 @@ MainWindow::MainWindow(bool     statupInTray,
             ui->tabhost->setStyleSheet(QString("QWidget#tabHostPage1,QWidget#tabHostPage2,QWidget#tabHostPage3,QWidget#tabHostPage4,QWidget#tabHostPage5,QWidget#tabHostPage6,QWidget#tabHostPage7{background-color: %1;}").arg(qApp->palette().window().color().lighter().name()));
             ui->tabbar->redrawTabBar();
             ui->eq_widget->setAccentColor(palette().highlight().color());
+            ui->comp_response->setAccentColor(palette().highlight().color());
         });
 
         connect(&AppConfig::instance(), &AppConfig::updated, this, &MainWindow::onAppConfigUpdated);
@@ -388,6 +390,7 @@ MainWindow::MainWindow(bool     statupInTray,
     {
         restoreGraphicEQView();
         ui->eq_widget->setAlwaysDrawHandles(AppConfig::instance().get<bool>(AppConfig::EqualizerShowHandles));
+        ui->comp_response->setAlwaysDrawHandles(AppConfig::instance().get<bool>(AppConfig::EqualizerShowHandles));
 
         ui->tabbar->setAnimatePageChange(true);
         ui->tabbar->setCustomStackWidget(ui->tabhost);
@@ -525,14 +528,15 @@ void MainWindow::onAppConfigUpdated(const AppConfig::Key &key, const QVariant &v
 {
     switch(key)
     {
-        case AppConfig::EqualizerShowHandles:
-            ui->eq_widget->setAlwaysDrawHandles(value.toBool());
-            break;
-        case AppConfig::TrayIconEnabled:
-            _trayIcon->setTrayVisible(value.toBool());
-            break;
-        default:
-            break;
+    case AppConfig::EqualizerShowHandles:
+        ui->eq_widget->setAlwaysDrawHandles(value.toBool());
+        ui->comp_response->setAlwaysDrawHandles(value.toBool());
+        break;
+    case AppConfig::TrayIconEnabled:
+        _trayIcon->setTrayVisible(value.toBool());
+        break;
+    default:
+        break;
     }
 }
 
@@ -655,10 +659,49 @@ void MainWindow::loadConfig()
     ui->bs2b_fcut->setValueA(DspConfig::instance().get<int>(DspConfig::crossfeed_bs2b_fcut));
     ui->bs2b_custom_box->setEnabled(bs2bMode == 99);
 
-    ui->enable_comp->setChecked(DspConfig::instance().get<bool>(DspConfig::compression_enable));
-    ui->comp_maxattack->setValueA(DspConfig::instance().get<int>(DspConfig::compression_maxatk));
-    ui->comp_maxrelease->setValueA(DspConfig::instance().get<int>(DspConfig::compression_maxrel));
-    ui->comp_aggressiveness->setValueA(DspConfig::instance().get<int>(DspConfig::compression_aggressiveness));
+    ui->enable_comp->setChecked(DspConfig::instance().get<bool>(DspConfig::compander_enable));
+    ui->comp_granularity->setValueA(DspConfig::instance().get<int>(DspConfig::compander_granularity));
+    ui->comp_timeconstant->setValueA(100 * DspConfig::instance().get<float>(DspConfig::compander_timeconstant));
+    int companderTrans = DspConfig::instance().get<int>(DspConfig::compander_time_freq_transforms);
+    int companderTransIdx = ui->crossfeed_mode->findData(companderTrans);
+    if(companderTransIdx < 0)
+        Log::error(QString("Compander TF transform index for value %1 not found").arg(companderTrans));
+    else
+        ui->comp_tf_transforms->setCurrentIndex(companderTransIdx);
+
+    {
+        // Parse compander response
+        QVector<float> rawCompanderData;
+
+        for (const auto &val : chopDoubleQuotes(DspConfig::instance().get<QString>(DspConfig::compander_response)).split(";"))
+        {
+            rawCompanderData.push_back(val.isEmpty() ? 0.f : val.toFloat());
+        }
+
+        // TODO: This needs to be cleaned up and put into LiquidEq subproject instead
+        int  it = 7;
+        bool eqReloadRequired = false;
+        for (auto cur_data : ui->comp_response->getBands())
+        {
+            if (it >= rawCompanderData.count())
+            {
+                break;
+            }
+
+            bool equal = isApproximatelyEqual<float>(cur_data, rawCompanderData.at(it));
+            if (eqReloadRequired == false)
+            {
+                eqReloadRequired = !equal;
+            }
+
+            it++;
+        }
+
+        if (eqReloadRequired && rawCompanderData.length() >= 14)
+        {
+            ui->comp_response->setBands(QVector<double>(rawCompanderData.cbegin() + 7, rawCompanderData.constEnd()), false);
+        }
+    }
 
     ui->limthreshold->setValueA(DspConfig::instance().get<int>(DspConfig::master_limthreshold));
     ui->limrelease->setValueA(DspConfig::instance().get<int>(DspConfig::master_limrelease));
@@ -806,10 +849,31 @@ void MainWindow::applyConfig()
     DspConfig::instance().set(DspConfig::convolver_file,             QVariant(_currentImpulseResponse));
     DspConfig::instance().set(DspConfig::convolver_waveform_edit,    QVariant(_currentConvWaveformEdit));
 
-    DspConfig::instance().set(DspConfig::compression_enable,         QVariant(ui->enable_comp->isChecked()));
-    DspConfig::instance().set(DspConfig::compression_maxatk,         QVariant(ui->comp_maxattack->valueA()));
-    DspConfig::instance().set(DspConfig::compression_maxrel,         QVariant(ui->comp_maxrelease->valueA()));
-    DspConfig::instance().set(DspConfig::compression_aggressiveness, QVariant(ui->comp_aggressiveness->valueA()));
+    DspConfig::instance().set(DspConfig::compander_enable,           QVariant(ui->enable_comp->isChecked()));
+    DspConfig::instance().set(DspConfig::compander_granularity,      QVariant(ui->comp_granularity->valueA()));
+    DspConfig::instance().set(DspConfig::compander_timeconstant,     QVariant(ui->comp_timeconstant->valueA() / 100.0f));
+    DspConfig::instance().set(DspConfig::compander_time_freq_transforms, QVariant(ui->comp_tf_transforms->currentIndex()));
+    // TODO: this needs to be moved into LiquidEQ subproject too
+    {
+        QVector<double> compBands     = ui->comp_response->getBands();
+        QString         rawCompString = "95.0;200.0;400.0;800.0;1600.0;3400.0;7500.0;";
+        int             counter     = 0;
+
+        for (auto band : compBands)
+        {
+            rawCompString.append(QString::number(band));
+
+            if (counter < 6)
+            {
+                rawCompString.append(';');
+            }
+
+            counter++;
+        }
+
+        DspConfig::instance().set(DspConfig::compander_response, QVariant(rawCompString));
+    }
+
 
     DspConfig::instance().set(DspConfig::tone_enable,                QVariant(ui->enable_eq->isChecked()));
     DspConfig::instance().set(DspConfig::tone_filtertype,            QVariant(ui->eqfiltertype->currentIndex()));
@@ -961,12 +1025,13 @@ void MainWindow::installUnitData()
     ui->rev_osf->setProperty("unit", "x");
 
     QList<QAnimatedSlider*> div100({ui->rev_era, ui->rev_erf, ui->rev_erw, ui->rev_width, ui->rev_bass, ui->rev_spin, ui->rev_wander, ui->rev_decay,
-                                    ui->analog_tubedrive});
+                                    ui->analog_tubedrive, ui->comp_timeconstant});
 
     QList<QAnimatedSlider*> div10({ui->bs2b_feed, ui->rev_delay, ui->rev_wet, ui->rev_finalwet, ui->rev_finaldry, ui->rev_width});
 
     QList<QAnimatedSlider*> unitDecibel({ui->bs2b_feed, ui->rev_wet, ui->rev_finalwet, ui->rev_finaldry, ui->analog_tubedrive, ui->postgain, ui->bass_maxgain});
-    QList<QAnimatedSlider*> unitMs({ui->rev_delay, ui->comp_maxattack, ui->comp_maxrelease, ui->limrelease});
+    QList<QAnimatedSlider*> unitMs({ui->rev_delay, ui->limrelease});
+    QList<QAnimatedSlider*> unitS({ui->comp_timeconstant});
     QList<QAnimatedSlider*> unitHz({ui->bs2b_fcut, ui->rev_lcb, ui->rev_lcd, ui->rev_lci, ui->rev_lco});
 
     foreach(auto w, div100)
@@ -978,8 +1043,12 @@ void MainWindow::installUnitData()
         w->setProperty("unit", "dB");
     foreach(auto w, unitMs)
         w->setProperty("unit", "ms");
+    foreach(auto w, unitS)
+        w->setProperty("unit", "s");
     foreach(auto w, unitHz)
         w->setProperty("unit", "Hz");
+
+    ui->comp_granularity->setCustomValueStrings({tr("Very low"), tr("Low"), tr("Medium"), tr("High"), tr("Extreme")});
 }
 
 // DDC
@@ -1217,20 +1286,20 @@ void MainWindow::saveGraphicEQView()
 void MainWindow::connectActions()
 {
     QList<QAnimatedSlider*> sliders({
-                              ui->stereowide_level, ui->bs2b_fcut, ui->bs2b_feed, ui->rev_osf, ui->rev_erf, ui->rev_era, ui->rev_erw,
-                              ui->rev_lci, ui->rev_lcb, ui->rev_lcd, ui->rev_lco, ui->rev_finalwet, ui->rev_finaldry, ui->rev_wet, ui->rev_width, ui->rev_spin,
-                              ui->rev_wander, ui->rev_decay, ui->rev_delay, ui->rev_bass, ui->analog_tubedrive, ui->limthreshold,
-                              ui->limrelease, ui->comp_maxrelease, ui->comp_maxattack, ui->comp_aggressiveness,
-                              ui->bass_maxgain, ui->postgain
-                          });
+                                        ui->stereowide_level, ui->bs2b_fcut, ui->bs2b_feed, ui->rev_osf, ui->rev_erf, ui->rev_era, ui->rev_erw,
+                                        ui->rev_lci, ui->rev_lcb, ui->rev_lcd, ui->rev_lco, ui->rev_finalwet, ui->rev_finaldry, ui->rev_wet, ui->rev_width, ui->rev_spin,
+                                        ui->rev_wander, ui->rev_decay, ui->rev_delay, ui->rev_bass, ui->analog_tubedrive, ui->limthreshold,
+                                        ui->limrelease, ui->comp_granularity, ui->comp_timeconstant,
+                                        ui->bass_maxgain, ui->postgain
+                                    });
 
     QList<QWidget*> registerClick({
-                              ui->bassboost, ui->bs2b, ui->stereowidener, ui->analog, ui->reverb, ui->enable_eq, ui->enable_comp, ui->ddc_enable, ui->conv_enable,
-                              ui->graphicEq->chk_enable
-                          });
+                                      ui->bassboost, ui->bs2b, ui->stereowidener, ui->analog, ui->reverb, ui->enable_eq, ui->enable_comp, ui->ddc_enable, ui->conv_enable,
+                                      ui->graphicEq->chk_enable
+                                  });
 
     foreach(QAnimatedSlider* w, sliders)
-    {        
+    {
         connect(w, &QAnimatedSlider::stringChanged, ui->info, qOverload<const QString&>(&FadingLabel::setAnimatedText));
         connect(w, &QAnimatedSlider::valueChangedA, this, &MainWindow::applyConfig);
     }
@@ -1257,6 +1326,9 @@ void MainWindow::connectActions()
     connect(ui->eq_widget,          &LiquidEqualizerWidget::bandsUpdated, this, &MainWindow::applyConfig);
     connect(ui->eq_widget,          &LiquidEqualizerWidget::mouseReleased, this, &MainWindow::determineEqPresetName);
 
+    connect(ui->comp_response,      &LiquidCompanderWidget::bandsUpdated, this, &MainWindow::applyConfig);
+    connect(ui->comp_tf_transforms, qOverload<int>(&QComboBox::currentIndexChanged), this, &MainWindow::applyConfig);
+
     connect(ui->conv_adv_wave_edit, &QAbstractButton::clicked, this, &MainWindow::onConvolverWaveformEdit);
 
     connect(ui->graphicEq,          &GraphicEQFilterGUI::mouseUp, this, &MainWindow::applyConfig);

src/MainWindow.ui

@@ -7,13 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>700</width>
-    <height>410</height>
+    <height>430</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>700</width>
-    <height>410</height>
+    <height>430</height>
    </size>
   </property>
   <property name="maximumSize">
@@ -308,10 +308,10 @@
                  <item>
                   <widget class="QGroupBox" name="enable_comp">
                    <property name="whatsThis">
-                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Dynamic range compressor&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Enables/disables the dynamic range compressor, an automatic dynamic range flattener that can flatten the signal spectral to reduce transient; it is like a drum volume reducer.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Max attack:&lt;/span&gt; adjusts how fast the Dynamic Range Compressor reacts.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Max release:&lt;/span&gt; adjusts how slow the Dynamic Range Compressor is performing gain decay.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Aggressiveness:&lt;/span&gt; adjusts how strong the spectral flattening is going to be&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Dynamic range compander&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Enables/disables the dynamic range compander.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                    </property>
                    <property name="title">
-                    <string>Dynamic range compressor</string>
+                    <string>Dynamic range compander</string>
                    </property>
                    <property name="checkable">
                     <bool>true</bool>
@@ -321,14 +321,14 @@
                    </property>
                    <layout class="QVBoxLayout" name="verticalLayout_4">
                     <item>
-                     <widget class="QLabel" name="comp_atk_label">
+                     <widget class="QLabel" name="comp_timeconst_label">
                       <property name="text">
-                       <string>Maximum attack</string>
+                       <string>Time constant</string>
                       </property>
                      </widget>
                     </item>
                     <item>
-                     <widget class="QAnimatedSlider" name="comp_maxattack">
+                     <widget class="QAnimatedSlider" name="comp_timeconstant">
                       <property name="sizePolicy">
                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                         <horstretch>0</horstretch>
@@ -342,10 +342,13 @@
                        </size>
                       </property>
                       <property name="minimum">
-                       <number>0</number>
+                       <number>6</number>
                       </property>
                       <property name="maximum">
-                       <number>400</number>
+                       <number>30</number>
+                      </property>
+                      <property name="pageStep">
+                       <number>5</number>
                       </property>
                       <property name="orientation">
                        <enum>Qt::Horizontal</enum>
@@ -358,20 +361,23 @@
                     <item>
                      <widget class="QLabel" name="label_7">
                       <property name="text">
-                       <string>Maximum release</string>
+                       <string>Granularity</string>
                       </property>
                      </widget>
                     </item>
                     <item>
-                     <widget class="QAnimatedSlider" name="comp_maxrelease">
+                     <widget class="QAnimatedSlider" name="comp_granularity">
                       <property name="minimum">
                        <number>0</number>
                       </property>
                       <property name="maximum">
-                       <number>400</number>
+                       <number>4</number>
+                      </property>
+                      <property name="pageStep">
+                       <number>1</number>
                       </property>
                       <property name="value">
-                       <number>200</number>
+                       <number>0</number>
                       </property>
                       <property name="orientation">
                        <enum>Qt::Horizontal</enum>
@@ -381,39 +387,42 @@
                     <item>
                      <widget class="QLabel" name="label_5">
                       <property name="text">
-                       <string>Aggressiveness</string>
+                       <string>Time-frequency transforms</string>
                       </property>
                      </widget>
                     </item>
                     <item>
-                     <widget class="QAnimatedSlider" name="comp_aggressiveness">
-                      <property name="minimum">
-                       <number>10</number>
-                      </property>
-                      <property name="maximum">
-                       <number>1000</number>
-                      </property>
-                      <property name="value">
-                       <number>800</number>
-                      </property>
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
+                     <widget class="QComboBox" name="comp_tf_transforms">
+                      <item>
+                       <property name="text">
+                        <string>Uniform (Short-time Fourier)</string>
+                       </property>
+                      </item>
+                      <item>
+                       <property name="text">
+                        <string>Multiresolution (Continuous wavelet)</string>
+                       </property>
+                      </item>
+                      <item>
+                       <property name="text">
+                        <string>Multiresolution (Time domain)</string>
+                       </property>
+                      </item>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="LiquidCompanderWidget" name="comp_response" native="true">
+                      <property name="minimumSize">
+                       <size>
+                        <width>0</width>
+                        <height>145</height>
+                       </size>
                       </property>
                      </widget>
                     </item>
                    </layout>
                   </widget>
                  </item>
-                 <item>
-                  <widget class="LiquidCompanderWidget" name="widget" native="true">
-                   <property name="minimumSize">
-                    <size>
-                     <width>0</width>
-                     <height>150</height>
-                    </size>
-                   </property>
-                  </widget>
-                 </item>
                  <item>
                   <spacer name="verticalSpacer_4">
                    <property name="orientation">