aboutsummaryrefslogtreecommitdiff
path: root/utils/gen_adldata/progs_cache.h
diff options
context:
space:
mode:
authorVitaly Novichkov <admin@wohlnet.ru>2018-08-06 01:56:50 +0300
committerVitaly Novichkov <admin@wohlnet.ru>2018-08-06 01:56:50 +0300
commit1ab34e88a326c396fbb42c503eb4ffa56fa0a148 (patch)
tree4f2d6ada0ab0bd1d64947a71c5492a29be7c8dbf /utils/gen_adldata/progs_cache.h
parent0a003c8bc12514a5586f2f0e40559fcbf6607883 (diff)
parent0e2807a9d4c8c900e85c9b33ba96c69a82c58a68 (diff)
downloadlibADLMIDI-1ab34e88a326c396fbb42c503eb4ffa56fa0a148.tar.gz
libADLMIDI-1ab34e88a326c396fbb42c503eb4ffa56fa0a148.tar.bz2
libADLMIDI-1ab34e88a326c396fbb42c503eb4ffa56fa0a148.zip
Merge branch 'master' into stable
Diffstat (limited to 'utils/gen_adldata/progs_cache.h')
-rw-r--r--utils/gen_adldata/progs_cache.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/utils/gen_adldata/progs_cache.h b/utils/gen_adldata/progs_cache.h
index 5a916f5..1212097 100644
--- a/utils/gen_adldata/progs_cache.h
+++ b/utils/gen_adldata/progs_cache.h
@@ -55,6 +55,7 @@ struct ins
bool pseudo4op;
bool real4op;
double voice2_fine_tune;
+ int8_t midi_velocity_offset;
bool operator==(const ins &b) const
{
@@ -63,7 +64,8 @@ struct ins
&& insno2 == b.insno2
&& pseudo4op == b.pseudo4op
&& real4op == b.real4op
- && equal_approx(voice2_fine_tune, b.voice2_fine_tune);
+ && equal_approx(voice2_fine_tune, b.voice2_fine_tune)
+ && midi_velocity_offset == b.midi_velocity_offset;
}
bool operator< (const ins &b) const
{
@@ -73,6 +75,7 @@ struct ins
if(pseudo4op != b.pseudo4op) return pseudo4op < b.pseudo4op;
if(real4op != b.real4op) return real4op < b.real4op;
if(!equal_approx(voice2_fine_tune, b.voice2_fine_tune)) return voice2_fine_tune < b.voice2_fine_tune;
+ if(midi_velocity_offset != b.midi_velocity_offset) return midi_velocity_offset < b.midi_velocity_offset;
return 0;
}
bool operator!=(const ins &b) const