diff options
author | Volker Fischer <corrados@users.noreply.github.com> | 2021-08-11 18:13:16 +0200 |
---|---|---|
committer | Volker Fischer <corrados@users.noreply.github.com> | 2021-08-11 18:13:16 +0200 |
commit | 3d9ac2501596b8697a68088a1dfc18aae209ca37 (patch) | |
tree | a2d6ac17101affb8c09e97119f8f2687b1fc1519 | |
parent | a2d6e7f067c22b0015b8c9b1e97cb7dfaffd2925 (diff) | |
parent | ea799cf6da8369de42c0ba659172003b5e812163 (diff) |
Merge branch 'edrumulus' into corrados_hihat_controller
# Conflicts:
# src/inputprocessor.cc
-rw-r--r-- | src/inputprocessor.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/inputprocessor.cc b/src/inputprocessor.cc index cbb74ad..a16115c 100644 --- a/src/inputprocessor.cc +++ b/src/inputprocessor.cc @@ -353,7 +353,7 @@ bool InputProcessor::processChoke(event_t& event, if(event_sample.instrument_id == instrument_id /*&& event_sample.rampdown_count == -1*/) // Only if not already ramping. { - // Fixed group rampdown time of 68ms, independent of samplerate + // Fixed group rampdown time of 180ms, independent of samplerate // quick hack: all "Only if not already ramping" must be disabled for hi-hat pedal to work if(event.offset >= 1000000) // quick hack: added 1000000 to offset to transport hi-hat controller value @@ -364,7 +364,7 @@ if(event.offset >= 1000000) // quick hack: added 1000000 to offset to transport } else { - applyChoke(settings, event_sample, 450, event.offset); + applyChoke(settings, event_sample, 180, event.offset); } } } |