diff options
| author | JP Cimalando <jp-dev@inbox.ru> | 2018-07-26 04:54:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 04:54:59 +0200 |
| commit | 7184785f1e4a4b3d64e0c4a0f4800e0355a99bb9 (patch) | |
| tree | f8900f1427a66cb3638335fe9c6f21ee3b429ade /src | |
| parent | e4a72fd8329fa9c47409fce3b88236d594471d9b (diff) | |
| parent | 92fafc57d48fc865232c22c313a22faa3dbc008f (diff) | |
| download | libADLMIDI-7184785f1e4a4b3d64e0c4a0f4800e0355a99bb9.tar.gz libADLMIDI-7184785f1e4a4b3d64e0c4a0f4800e0355a99bb9.tar.bz2 libADLMIDI-7184785f1e4a4b3d64e0c4a0f4800e0355a99bb9.zip | |
Merge pull request #143 from jpcima/velocity-offset-2
add midi_velocity_offset in the conversion, and add unit test
Diffstat (limited to 'src')
| -rw-r--r-- | src/adlmidi_cvt.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/adlmidi_cvt.hpp b/src/adlmidi_cvt.hpp index d8f4513..449fe2f 100644 --- a/src/adlmidi_cvt.hpp +++ b/src/adlmidi_cvt.hpp @@ -40,6 +40,7 @@ static void cvt_generic_to_FMIns(adlinsdata2 &ins, const WOPLI &in) ins.voice2_fine_tune = voice2_fine_tune * (15.625 / 1000.0); } + ins.midi_velocity_offset = in.midi_velocity_offset; ins.tone = in.percussion_key_number; ins.flags = (in.inst_flags & WOPL_Ins_4op) && (in.inst_flags & WOPL_Ins_Pseudo4op) ? adlinsdata::Flag_Pseudo4op : 0; ins.flags|= (in.inst_flags & WOPL_Ins_4op) && ((in.inst_flags & WOPL_Ins_Pseudo4op) == 0) ? adlinsdata::Flag_Real4op : 0; @@ -93,6 +94,7 @@ static void cvt_FMIns_to_generic(WOPLI &ins, const adlinsdata2 &in) } } + ins.midi_velocity_offset = in.midi_velocity_offset; ins.percussion_key_number = in.tone; ins.inst_flags = (in.flags & (adlinsdata::Flag_Pseudo4op|adlinsdata::Flag_Real4op)) ? WOPL_Ins_4op : 0; ins.inst_flags|= (in.flags & adlinsdata::Flag_Pseudo4op) ? WOPL_Ins_Pseudo4op : 0; |