Added source of v0.0.2.1.0.9

Author: HendrikNoeller

doc/Sound2Light_Tool_Anleitung.pdf

@@ -1,6 +1,10 @@
 
 # Sound2Light Change Log
 
+### Version 0.0.2.1.0.9 - 1 Mar 2017
+
+- Supports Muting the OSC output of individual channels
+
 ### Version 0.0.2.1.0.8 - 1 Mar 2017
 
 - Fixed BPM OSC Messages with a one digit value being interpreted falsely on EOS

doc/Sound2Light_Tool_Manual_en.pdf

@@ -21,11 +21,25 @@
 #include "BPMOscControler.h"
 
 BPMOscControler::BPMOscControler(OSCNetworkManager &osc) :
-    m_osc(osc)
+    m_bpmMute(false)
+  , m_osc(osc)
   , m_oscCommands()
 {
 }
 
+void BPMOscControler::setBPMMute(bool mute)
+{
+    m_bpmMute = mute;
+
+    m_osc.sendMessage("/s2l/out/bpm/mute", (m_bpmMute ? "1" : "0"), true);
+}
+
+void BPMOscControler::toggleBPMMute()
+{
+    m_bpmMute = !m_bpmMute;
+    m_osc.sendMessage("/s2l/out/bpm/mute", (m_bpmMute ? "1" : "0"), true);
+}
+
 // Restore the commands from e.g. a preset or whatever else
 void BPMOscControler::restore(QSettings& settings)
 {
@@ -55,6 +69,9 @@ inline int round(float value) { return (fmod(value,1.0) < 0.5) ? value : value +
 // Called by the bpm detector to make the controller send the new bpm to the clients
 void BPMOscControler::transmitBPM(float bpm)
 {
+    // Don't transmit if mute is engaged
+    if (m_bpmMute) return;
+
     // Send user specified commands
 
     for (QString& command : m_oscCommands) {

doc/s2l_changelog.md

@@ -29,6 +29,11 @@ class BPMOscControler
 public:
     BPMOscControler(OSCNetworkManager& osc);
 
+    // Getter/Setter for mute
+    bool getBPMMute() { return m_bpmMute; }
+    void setBPMMute(bool mute);
+    void toggleBPMMute();
+
     // Called by the bpm detector to make the controller send the new bpm to the clients
     void transmitBPM(float bpm);
 
@@ -49,6 +54,7 @@ class BPMOscControler
 
 
 protected:
+    bool                m_bpmMute; // If the bpm osc is muted
     OSCNetworkManager&  m_osc; // The network manager to send network signals thorugh
     QStringList         m_oscCommands; // The osc messages to be sent on a tempo changed. Delivered as finished strings with the <BPM> (<BPM1-2>, <BPM4> etc. for fractions from 1/4 to 4) qualifier to be changed. The message is generated in the qml because thats the way tim did it with the other osc messages
 };

doc/screenshot_main_window.png

@@ -0,0 +1,19 @@
+// Copyright (c) 2016 Electronic Theatre Controls, Inc., http://www.etcconnect.com
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.

src/BPMOscControler.cpp

@@ -474,6 +474,8 @@ void MainController::loadPreset(const QString &constFileName, bool createIfNotEx
     // Restore the manual BPM
     m_bpmTap.setBpm(settings.value("bpm/tapvalue", 60).toInt());
 
+    m_bpmOSC.setBPMMute(settings.value("bpm/mute", false).toBool());
+
 
 	// this is now the loaded preset, update the preset name:
 	m_currentPresetFilename = fileName; emit presetNameChanged();
@@ -491,6 +493,7 @@ void MainController::loadPreset(const QString &constFileName, bool createIfNotEx
     emit bpmActiveChanged();
     emit bpmRangeChanged();
     emit waveformVisibleChanged();
+    emit bpmMuteChanged();
 
 	emit m_bassController->parameterChanged();
 	emit m_loMidController->parameterChanged();
@@ -505,6 +508,13 @@ void MainController::loadPreset(const QString &constFileName, bool createIfNotEx
 	emit m_highController->oscLabelTextChanged();
 	emit m_envelopeController->oscLabelTextChanged();
 	emit m_silenceController->oscLabelTextChanged();
+
+    emit m_bassController->muteChanged();
+    emit m_loMidController->muteChanged();
+    emit m_hiMidController->muteChanged();
+    emit m_highController->muteChanged();
+    emit m_envelopeController->muteChanged();
+    emit m_silenceController->muteChanged();
 }
 
 void MainController::savePresetAs(const QString &constFileName, bool isAutosave)
@@ -547,9 +557,12 @@ void MainController::savePresetAs(const QString &constFileName, bool isAutosave)
     // save the settings in the BPMOscController
     m_bpmOSC.save(settings);
 
-    // Restore the manual BPM
+    // save the manual BPM
     settings.setValue("bpm/tapvalue", m_bpmTap.getBpm());
 
+    // save bpm mute
+    settings.setValue("bpm/mute", m_bpmOSC.getBPMMute());
+
 	if (!isAutosave) {
 		// this is now the loaded preset, update the preset name:
 		m_currentPresetFilename = fileName; emit presetNameChanged();

src/BPMOscControler.h

@@ -130,6 +130,9 @@ class MainController : public QObject
     // emitted if the waveform visiblity changed
     void waveformVisibleChanged();
 
+    // emitted if the bpm mute changed
+    void bpmMuteChanged();
+
 	// forwarded from OSCNetworkManager:
 	void messageReceived(OSCMessage msg);
 	void packetSent();
@@ -246,6 +249,10 @@ public slots:
     // gets the minium bpm of the range
     int getMinBPM() { return m_bpm.getMinBPM(); }
 
+    // set/get bpm mute
+    bool getBPMMute() { return m_bpmOSC.getBPMMute(); }
+    void toggleBPMMute() { m_bpmOSC.toggleBPMMute(); emit bpmMuteChanged(); }
+
     // set/get the waveform visibility
     bool getWaveformVisible() { return m_waveformVisible & m_bpmActive; }
     void setWaveformVisible(bool value) { m_waveformVisible = value; emit waveformVisibleChanged();}

src/LICENSE.txt

@@ -82,6 +82,20 @@ void OSCMapping::handleMessage(OSCMessage msg)
         if (msg.arguments().size() == 0 || msg.arguments().at(0).toBool()) {
             m_controller->triggerBeat();
         }
+    } else if (msg.pathStartsWith("/s2l/bpm/mute")) {
+        m_controller->toggleBPMMute();
+    } else if (msg.pathStartsWith("/s2l/bass/mute")) {
+        m_controller->m_bassController->toggleMute();
+    } else if (msg.pathStartsWith("/s2l/lo_mid/mute")) {
+        m_controller->m_loMidController->toggleMute();
+    } else if (msg.pathStartsWith("/s2l/hi_mid/mute")) {
+        m_controller->m_hiMidController->toggleMute();
+    } else if (msg.pathStartsWith("/s2l/high/mute")) {
+        m_controller->m_highController->toggleMute();
+    } else if (msg.pathStartsWith("/s2l/level/mute")) {
+        m_controller->m_envelopeController->toggleMute();
+    } else if (msg.pathStartsWith("/s2l/silence/mute")) {
+        m_controller->m_silenceController->toggleMute();
     }
 }