From 5feb790b60748f8e1a45842b5e0f30695a337cd3 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Fri, 12 Jan 2018 14:28:19 +0000 Subject: [PATCH] Fixes for modwheel. --- src/Makefile | 4 ++-- src/dexed.cpp | 1 + src/msfa/controllers.h | 6 ++++-- src/presets.ttl | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Makefile b/src/Makefile index 6a17374..f55aa89 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,8 +1,8 @@ BUNDLE=dexed.lv2 TARGET=dexed.so -DEBUG=1 -FILETRACE=1 +#DEBUG=1 +#FILETRACE=1 INSTALL_DIR=/zynthian/zynthian-plugins/lv2 INSTALL_MYPLUGINS_DIR=/zynthian/zynthian-my-plugins/lv2 diff --git a/src/dexed.cpp b/src/dexed.cpp index a105ee2..4c8ed65 100644 --- a/src/dexed.cpp +++ b/src/dexed.cpp @@ -784,6 +784,7 @@ void Dexed::onParam(uint8_t param_num,float param_val) controllers.values_[kControllerPitchStep]=data[param_num]; break; case 157: + TRACE("wheel.setRange(%d)",data[param_num]); controllers.wheel.setRange(data[param_num]); break; case 158: diff --git a/src/msfa/controllers.h b/src/msfa/controllers.h index 3aca269..e4dd79b 100755 --- a/src/msfa/controllers.h +++ b/src/msfa/controllers.h @@ -48,6 +48,7 @@ struct FmMod { void setRange(uint8_t r) { range = r < 0 && r > 127 ? 0 : r; + TRACE("range=%d",range); } void setTarget(uint8_t assign) { @@ -64,8 +65,9 @@ struct FmMod { class Controllers { void applyMod(int cc, FmMod &mod) { float range = 0.01 * mod.range; - uint8_t total = cc * range; - TRACE("amp[%d]|pitch[%d]|eg[%d] %d",mod.amp,mod.pitch,mod.eg,total); + uint8_t total = (float)cc * range; + TRACE("amp[%d]|pitch[%d]|eg[%d]",mod.amp,mod.pitch,mod.eg); + TRACE("range=%f mod.range=%d total=%d cc=%d",range,mod.range,total,cc); if(mod.amp) amp_mod = max(amp_mod, total); diff --git a/src/presets.ttl b/src/presets.ttl index 7b8bcf0..ce49d7b 100644 --- a/src/presets.ttl +++ b/src/presets.ttl @@ -34,7 +34,7 @@ pset:value 99.0 ] , [ lv2:symbol "mod_wheel_assign" ; - pset:value 0.0 + pset:value 7.0 ] , [ lv2:symbol "foot_ctrl_range" ; pset:value 99.0