Added Low Solo Mode -> 0.0.1.1.0.16

Author: luminosuslight

src/FFTAnalyzer.cpp

@@ -50,7 +50,7 @@ void FFTAnalyzer::calculateWindow()
 	}
 }
 
-void FFTAnalyzer::calculateFFT()
+void FFTAnalyzer::calculateFFT(bool lowSoloMode)
 {
 	// apply window:
 	for (int i=0; i < NUM_SAMPLES; ++i) {
@@ -73,8 +73,15 @@ void FFTAnalyzer::calculateFFT()
 	// give linear spectrum to ScaledSpectrum object to be scalled:
 	m_scaledSpectrum.updateWithLinearSpectrum(m_linearSpectrum);
 
-	// next element in processing chain: TriggerGenerators
-	for (int i=0; i<m_triggerContainer.size(); ++i) {
-		m_triggerContainer[i]->checkForTrigger(m_scaledSpectrum);
-	}
+    // next element in processing chain: TriggerGenerators
+    bool triggered = false;
+    for (int i=0; i<m_triggerContainer.size(); ++i) {
+        TriggerGeneratorInterface* trigger = m_triggerContainer[i];
+        if (trigger->isBandpass()) {
+            bool active = trigger->checkForTrigger(m_scaledSpectrum, lowSoloMode && triggered);
+            triggered = triggered || active;
+        } else {
+            trigger->checkForTrigger(m_scaledSpectrum, false);
+        }
+    }
 }

src/FFTAnalyzer.h

@@ -60,7 +60,7 @@ class FFTAnalyzer
 
 	// calculates the FFT based on the data in the inputBuffer and updates the ScaledSpectrum
 	// - usually called periodically 44 times per second
-	void calculateFFT();
+    void calculateFFT(bool lowSoloMode);
 
 	// returns the normalized spectrum of the ScaledSpectrum
 	const QVector<float>& getNormalizedSpectrum() const { return m_scaledSpectrum.getNormalizedSpectrum(); }

src/MainController.cpp

@@ -45,6 +45,7 @@ MainController::MainController(QQmlApplicationEngine* qmlEngine, QObject *parent
 	, m_osc()
 	, m_consoleType("EOS")
 	, m_oscMapping(this)
+    , m_lowSoloMode(false)
 {
 	m_audioInput = new QAudioInputWrapper(&m_buffer);
 
@@ -116,6 +117,7 @@ void MainController::initializeGenerators()
 
 	// append triggerGenerators to triggerContainer:
 	// (container is used to access all generators at once)
+    // order is important because of lowSoloMode
 	m_triggerContainer.append(m_bass);
 	m_triggerContainer.append(m_loMid);
 	m_triggerContainer.append(m_hiMid);
@@ -363,6 +365,7 @@ void MainController::loadPreset(const QString &constFileName, bool createIfNotEx
 	setFftCompression(settings.value("fftCompression").toReal());
 	setAgcEnabled(settings.value("agcEnabled").toBool());
 	setConsoleType(settings.value("consoleType").toString());
+    setLowSoloMode(settings.value("lowSoloMode").toBool());
 
 	// restore the settings in all TriggerGenerators:
 	for (int i=0; i<m_triggerContainer.size(); ++i) {
@@ -423,6 +426,7 @@ void MainController::savePresetAs(const QString &constFileName, bool isAutosave)
 	settings.setValue("fftCompression", getFftCompression());
 	settings.setValue("agcEnabled", getAgcEnabled());
 	settings.setValue("consoleType", getConsoleType());
+    settings.setValue("lowSoloMode", getLowSoloMode());
 
 	// save the settings in all TriggerGenerators:
 	for (int i=0; i<m_triggerContainer.size(); ++i) {

src/MainController.h

@@ -72,6 +72,8 @@ class MainController : public QObject
 	Q_PROPERTY(QString presetName READ getPresetName NOTIFY presetNameChanged)
 	// this property indicates if the current preset has been changed but not stored yet:
 	Q_PROPERTY(bool presetChangedButNotSaved READ getPresetChangedButNotSaved NOTIFY presetChangedButNotSavedChanged)
+    // this property is used for the lowSoloMode checkbox:
+    Q_PROPERTY(bool lowSoloMode READ getLowSoloMode WRITE setLowSoloMode NOTIFY lowSoloModeChanged)
 
 public:
 	explicit MainController(QQmlApplicationEngine* m_qmlEngine, QObject *parent = 0);
@@ -110,7 +112,10 @@ class MainController : public QObject
 	void compressionChanged();
 
 	// emitted when a value of the preset changed
-	void presetChanged();
+    void presetChanged();
+
+    // emitted when lowSoloMode changed
+    void lowSoloModeChanged();
 
 	// forwarded from OSCNetworkManager:
 	void messageReceived(OSCMessage msg);
@@ -139,7 +144,7 @@ public slots:
 	// restores the window size and position
 	void restoreWindowGeometry();
 
-	void updateFFT() { m_fft.calculateFFT(); }
+    void updateFFT() { m_fft.calculateFFT(m_lowSoloMode); }
 
 	// ------------------- Presets --------------------------------
 
@@ -186,6 +191,11 @@ public slots:
 	// sets the used console type (either "EOS" or "Cobalt")
 	void setConsoleType(QString value);
 
+    // returns if low solo mode is active
+    bool getLowSoloMode() const { return m_lowSoloMode; }
+    // enables or disables low solo mode
+    void setLowSoloMode(bool value) { m_lowSoloMode = value; emit lowSoloModeChanged(); }
+
 	// returns the current spectrum outline as a list of qreal values in the range 0...1
 	// used in GUI to display SpectrumPlot
 	QList<qreal> getSpectrumPoints();
@@ -307,6 +317,7 @@ private slots:
 	QMap<QString, QObject*>		m_dialogs;  // list of all open dialogs (QML-filename -> GUI element instance)
 	OSCMapping					m_oscMapping;  // OSCMapping instance
 	QTimer						m_oscUpdateTimer;  // Timer used to trigger OSC level feedback
+    bool                        m_lowSoloMode;  // true if low solo mode is active
 
 	TriggerGenerator* m_bass;  // pointer to Bass TriggerGenerator instance
 	TriggerGenerator* m_loMid;  // pointer to LoMid TriggerGenerator instance

src/TriggerGenerator.cpp

@@ -26,10 +26,9 @@
 #include <QtMath>
 
 TriggerGenerator::TriggerGenerator(QString name, OSCNetworkManager* osc, bool isBandpass, bool invert, int midFreq)
-	: TriggerGeneratorInterface()
+    : TriggerGeneratorInterface(isBandpass)
 	, m_name(name)
-	, m_osc(osc)
-	, m_isBandpass(isBandpass)
+    , m_osc(osc)
 	, m_invert(invert)
 	, m_midFreq(midFreq)
 	, m_defaultMidFreq(midFreq)
@@ -42,7 +41,7 @@ TriggerGenerator::TriggerGenerator(QString name, OSCNetworkManager* osc, bool is
 	resetParameters();
 }
 
-void TriggerGenerator::checkForTrigger(ScaledSpectrum &spectrum)
+bool TriggerGenerator::checkForTrigger(ScaledSpectrum &spectrum, bool forceRelease)
 {
 	qreal value;
 	if (m_isBandpass) {
@@ -53,11 +52,11 @@ void TriggerGenerator::checkForTrigger(ScaledSpectrum &spectrum)
 	if (m_invert) value = 1 - value;
 
 	// check for trigger:
-	if (!m_isActive && value >= m_threshold) {
+    if ((!m_isActive && value >= m_threshold) && !forceRelease) {
 		// activate trigger:
 		m_isActive = true;
 		m_filter.triggerOn();
-	} else if (m_isActive && value < m_threshold) {
+    } else if ((m_isActive && value < m_threshold) || forceRelease) {
 		// release trigger:
 		m_isActive = false;
 		m_filter.triggerOff();
@@ -76,6 +75,7 @@ void TriggerGenerator::checkForTrigger(ScaledSpectrum &spectrum)
 	}
 
 	m_lastValue = value;
+    return m_isActive;
 }
 
 void TriggerGenerator::save(QSettings& settings) const

src/TriggerGenerator.h

@@ -83,7 +83,7 @@ class TriggerGenerator : public TriggerGeneratorInterface
 	qreal getCurrentLevel() const { return m_lastValue; }
 
 	// checks if the max level within the frequency band is greater than the threshold
-	void checkForTrigger(ScaledSpectrum& spectrum) override;
+    bool checkForTrigger(ScaledSpectrum& spectrum, bool forceRelease) override;
 
 	// ---------------- Save and Restore ---------------
 
@@ -98,8 +98,7 @@ class TriggerGenerator : public TriggerGeneratorInterface
 
 protected:
 	const QString	m_name;  // name of the Trigger (used for save, restore and UI)
-	OSCNetworkManager*	m_osc;  // pointer to OSCNetworkManager instance (i.e. of MainController)
-	const bool		m_isBandpass;  // true if this is a bandpass (with frequency and width parameter)
+    OSCNetworkManager*	m_osc;  // pointer to OSCNetworkManager instance (i.e. of MainController)
 	const bool		m_invert;  // true if signal values should be inverted (i.e. for "silence" trigger)
 	int				m_midFreq;  // middle frequency of bandpass in Hz
 	const int		m_defaultMidFreq;  // default midFreq in Hz, used for reset

src/TriggerGeneratorInterface.h

@@ -36,11 +36,13 @@ class TriggerGeneratorInterface
 {
 
 public:
-	explicit TriggerGeneratorInterface() {}
+    explicit TriggerGeneratorInterface(bool isBandpass)
+        : m_isBandpass(isBandpass) {}
 	virtual ~TriggerGeneratorInterface() {}
 
 	// checks if a signal should be triggered by analyzing the given spectrum
-	virtual void checkForTrigger(ScaledSpectrum& spectrum) = 0;
+    // forceRelease is true when low solo mode is active and a lower trigger was activated
+    virtual bool checkForTrigger(ScaledSpectrum& spectrum, bool forceRelease) = 0;
 
 	// returns a reference to the internal TriggerFilter
 	virtual TriggerFilter& getTriggerFilter() = 0;
@@ -50,6 +52,12 @@ class TriggerGeneratorInterface
 
 	// restores parameters from QSettings
 	virtual void restore(QSettings& settings) = 0;
+
+    // returns if this is a Bandpass trigger generator
+    bool isBandpass() const { return m_isBandpass; }
+
+protected:
+    const bool m_isBandpass;  // true if this is a bandpass (with frequency and width parameter)
 };
 
 

src/qml/SpectrumWithControls.qml

@@ -165,7 +165,7 @@ Row {
 		// ------------------------- Gain and Compressor Sliders ---------------------
 		Row {
 			width: parent.width
-			height: parent.height - 30*2
+            height: parent.height - 30*3
 			// -------------------------- Gain
 			Column {
 				width: 80
@@ -232,7 +232,7 @@ Row {
 			}
 		}  // Row Gain and Compressor Sliders end
 
-		// ----------------------------- dB Checkbox and AGC Checkbox -----------------------
+        // ----------------------------- dB + AGC + LowSolo Checkbox -----------------------
 		DarkCheckBox {
 			id: agcCheckbox
 			width: parent.width - 20
@@ -261,5 +261,19 @@ Row {
 				onDecibelConversionChanged: dbCheckbox.checked = controller.decibelConversion
 			}
 		}
+        DarkCheckBox {
+            id: lowSoloCheckbox
+            width: parent.width - 20
+            height: 30
+            x: 20
+            checked: controller.lowSoloMode
+            onCheckedChanged: if (checked !== controller.lowSoloMode) controller.setLowSoloMode(checked)
+            text: "Low Solo Mode"
+
+            Connections {
+                target: controller
+                onLowSoloModeChanged: lowSoloCheckbox.checked = controller.lowSoloMode
+            }
+        }
 	}  // Right area column end
 }

src/versionInfo.h

@@ -25,7 +25,7 @@
 
 // This file includes the version number of this software.
 
-static const QString VERSION_STRING = "0.0.1.1.0.15";
+static const QString VERSION_STRING = "0.0.1.1.0.16";
 static const int SETTINGS_FORMAT_VERSION = 1;
 
 #endif // VERSIONINFO_H