Added channel pressure aftertouch.

mtytel · Mar 19, 2018 · 756e767 · 756e767
1 parent 559f5f1
commit 756e767
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/mopo/src/voice_handler.cpp b/mopo/src/voice_handler.cpp
@@ -344,6 +344,13 @@ namespace mopo {
     }
   }
 
+  void VoiceHandler::setChannelAftertouch(int channel, mopo_float aftertouch, int sample) {
+    for (Voice* voice : active_voices_) {
+      if (voice->state().channel == channel)
+        voice->setAftertouch(aftertouch, sample);
+    }
+  }
+
   void VoiceHandler::setPolyphony(size_t polyphony) {
     while (all_voices_.size() < polyphony) {
       Voice* new_voice = createVoice();

diff --git a/mopo/src/voice_handler.h b/mopo/src/voice_handler.h
@@ -146,6 +146,7 @@ namespace mopo {
                           int sample = 0, int channel = 0) override;
       virtual VoiceEvent noteOff(mopo_float note, int sample = 0) override;
       void setAftertouch(mopo_float note, mopo_float aftertouch, int sample = 0);
+      void setChannelAftertouch(int channel, mopo_float aftertouch, int sample = 0);
       void sustainOn();
       void sustainOff(int sample = 0);
 

diff --git a/src/common/midi_manager.cpp b/src/common/midi_manager.cpp
@@ -123,6 +123,11 @@ void MidiManager::processMidiMessage(const MidiMessage& midi_message, int sample
     mopo::mopo_float value = (1.0 * midi_message.getAfterTouchValue()) / mopo::MIDI_SIZE;
     engine_->setAftertouch(note, value);
   }
+  else if (midi_message.isChannelPressure()) {
+    int channel = midi_message.getChannel();
+    mopo::mopo_float value = midi_message.getChannelPressureValue() / (mopo::MIDI_SIZE - 1.0f);
+    engine_->setChannelAftertouch(channel, value);
+  }
   else if (midi_message.isPitchWheel()) {
     double percent = (1.0 * midi_message.getPitchWheelValue()) / PITCH_WHEEL_RESOLUTION;
     double value = 2 * percent - 1.0;

diff --git a/src/synthesis/helm_engine.cpp b/src/synthesis/helm_engine.cpp
@@ -406,6 +406,10 @@ namespace mopo {
     voice_handler_->setAftertouch(note, value, sample);
   }
 
+  void HelmEngine::setChannelAftertouch(int channel, mopo_float value, int sample) {
+    voice_handler_->setChannelAftertouch(channel, value, sample);
+  }
+
   void HelmEngine::setBpm(mopo_float bpm) {
     mopo_float bps = bpm / 60.0;
     if (bps_->value() != bps)

diff --git a/src/synthesis/helm_engine.h b/src/synthesis/helm_engine.h
@@ -60,6 +60,7 @@ namespace mopo {
       void setBpm(mopo_float bpm);
       void correctToTime(mopo_float samples) override;
       void setAftertouch(mopo_float note, mopo_float value, int sample = 0);
+      void setChannelAftertouch(int channel, mopo_float value, int sample = 0);
 
       // Sustain pedal events.
       void sustainOn();