Add option to disable EQ gain influence on waveforms

src/preferences/dialog/dlgprefwaveform.cpp

@@ -149,6 +149,10 @@ DlgPrefWaveform::DlgPrefWaveform(
             &QCheckBox::clicked,
             this,
             &DlgPrefWaveform::slotSetWaveformOptionHighDetail);
+    connect(visualizeEqGainCheckBox,
+            &QCheckBox::clicked,
+            this,
+            &DlgPrefWaveform::slotSetVisualizeEq);
     connect(defaultZoomComboBox,
             QOverload<int>::of(&QComboBox::currentIndexChanged),
             this,
@@ -280,6 +284,10 @@ void DlgPrefWaveform::slotUpdate() {
     updateEnableUntilMark();
     updateWaveformGeneralOptionsEnabled();
 
+    bool visualizeEqGain = m_pConfig->getValue(
+            ConfigKey("[Waveform]", "visualize_eq_gain"), true);
+    visualizeEqGainCheckBox->setChecked(visualizeEqGain);
+
     frameRateSpinBox->setValue(factory->getFrameRate());
     frameRateSlider->setValue(factory->getFrameRate());
     endOfTrackWarningTimeSpinBox->setValue(factory->getEndOfTrackWarningTime());
@@ -618,6 +626,10 @@ void DlgPrefWaveform::slotSetNormalizeOverview(bool normalize) {
     updateWaveformGainEnabled();
 }
 
+void DlgPrefWaveform::slotSetVisualizeEq(bool checked) {
+    WaveformWidgetFactory::instance()->setVisualizeEqGain(checked);
+}
+
 void DlgPrefWaveform::slotSetOverviewMinuteMarkers(bool draw) {
     m_pConfig->setValue(ConfigKey("[Waveform]", "draw_overview_minute_markers"), draw);
     m_pOverviewMinuteMarkersControl->forceSet(draw);

src/preferences/dialog/dlgprefwaveform.h

@@ -45,6 +45,7 @@ class DlgPrefWaveform : public DlgPreferencePage, public Ui::DlgPrefWaveformDlg
         slotSetWaveformOptions(allshader::WaveformRendererSignalBase::Option::HighDetail, checked);
     }
 #endif
+    void slotSetVisualizeEq(bool checked);
     void slotSetWaveformOverviewType();
     void slotSetDefaultZoom(int index);
     void slotSetZoomSynchronization(bool checked);

src/preferences/dialog/dlgprefwaveformdlg.ui

@@ -83,7 +83,14 @@ Select from different types of displays for the waveform, which differ primarily
           <string>High details</string>
          </property>
         </widget>
-       </item>
+      </item>
+      <item>
+        <widget class="QCheckBox" name="visualizeEqGainCheckBox">
+          <property name="text">
+            <string>Visualize EQ Gain</string>
+          </property>
+        </widget>
+      </item>
       </layout>
      </item>
 

src/waveform/renderers/waveformrenderersignalbase.cpp

@@ -160,6 +160,13 @@ void WaveformRendererSignalBase::setup(const QDomNode& node,
                 setHighVisualGain(highGain);
             });
 
+    connect(pWaveformFactory,
+            &WaveformWidgetFactory::visualizeEqGainChanged,
+            this,
+            [this](bool value) { m_visualizeEqGain = value; });
+
+    m_visualizeEqGain = pWaveformFactory->visualizeEqGain();
+
     setAllChannelVisualGain(pWaveformFactory->getVisualGain(BandIndex::AllBand));
     setLowVisualGain(pWaveformFactory->getVisualGain(BandIndex::Low));
     setMidVisualGain(pWaveformFactory->getVisualGain(BandIndex::Mid));
@@ -183,7 +190,11 @@ void WaveformRendererSignalBase::getGains(float* pAllGain,
         CSAMPLE_GAIN lowVisualGain = 1.0, midVisualGain = 1.0, highVisualGain = 1.0;
 
         // Only adjust low/mid/high gains if EQs are enabled.
-        if (m_pEQEnabled && m_pEQEnabled->get() > 0.0) {
+        if (!m_visualizeEqGain) {
+            lowVisualGain = m_lowVisualGain;
+            midVisualGain = m_midVisualGain;
+            highVisualGain = m_highVisualGain;
+        } else if (m_pEQEnabled && m_pEQEnabled->get() > 0.0) {
             if (m_pLowFilterControlObject &&
                     m_pMidFilterControlObject &&
                     m_pHighFilterControlObject) {

src/waveform/renderers/waveformrenderersignalbase.h

@@ -64,6 +64,8 @@ class WaveformRendererSignalBase : public QObject, public WaveformRendererAbstra
     CSAMPLE_GAIN m_midVisualGain;
     CSAMPLE_GAIN m_highVisualGain;
 
+    bool m_visualizeEqGain;
+
     float m_axesColor_r, m_axesColor_g, m_axesColor_b, m_axesColor_a;
     float m_signalColor_r, m_signalColor_g, m_signalColor_b;
     float m_signalColor_h, m_signalColor_s, m_signalColor_v;

src/waveform/waveformwidgetfactory.cpp

@@ -363,6 +363,10 @@ bool WaveformWidgetFactory::setConfig(UserSettingsPointer config) {
     bool zoomSync = m_config->getValue(ConfigKey("[Waveform]", "ZoomSynchronization"), m_zoomSync);
     setZoomSync(zoomSync);
 
+    bool visualizeEqGain = m_config->getValue(
+            ConfigKey("[Waveform]", "visualize_eq_gain"), m_visualizeEqGain);
+    setVisualizeEqGain(visualizeEqGain);
+
     int beatGridAlpha = m_config->getValue(ConfigKey("[Waveform]", "beatGridAlpha"), m_beatGridAlpha);
     setDisplayBeatGridAlpha(beatGridAlpha);
 
@@ -664,6 +668,13 @@ void WaveformWidgetFactory::setZoomSync(bool sync) {
     }
 }
 
+void WaveformWidgetFactory::setVisualizeEqGain(bool value) {
+    m_visualizeEqGain = value;
+    m_config->setValue(ConfigKey("[Waveform]", "visualize_eq_gain"), value);
+
+    emit visualizeEqGainChanged(value);
+}
+
 void WaveformWidgetFactory::setDisplayBeatGridAlpha(int alpha) {
     m_beatGridAlpha = alpha;
     if (m_waveformWidgetHolders.size() == 0) {

src/waveform/waveformwidgetfactory.h

@@ -191,6 +191,11 @@ class WaveformWidgetFactory : public QObject,
     void setZoomSync(bool sync);
     int isZoomSync() const { return m_zoomSync;}
 
+    bool visualizeEqGain() const {
+        return m_visualizeEqGain;
+    };
+    void setVisualizeEqGain(bool value);
+
     void setDisplayBeatGridAlpha(int alpha);
     int getBeatGridAlpha() const { return m_beatGridAlpha; }
 
@@ -225,6 +230,7 @@ class WaveformWidgetFactory : public QObject,
 
     void overviewNormalizeChanged();
     void visualGainChanged(double allChannelGain, double lowGain, double midGain, double highGain);
+    void visualizeEqGainChanged(bool value);
 
     void untilMarkShowBeatsChanged(bool value);
     void untilMarkShowTimeChanged(bool value);
@@ -283,6 +289,7 @@ class WaveformWidgetFactory : public QObject,
     int m_endOfTrackWarningTime;
     double m_defaultZoom;
     bool m_zoomSync;
+    bool m_visualizeEqGain;
     double m_visualGain[BandCount];
     bool m_overviewNormalized;