diff options
author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-08-06 01:56:50 +0300 |
---|---|---|
committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-08-06 01:56:50 +0300 |
commit | 1ab34e88a326c396fbb42c503eb4ffa56fa0a148 (patch) | |
tree | 4f2d6ada0ab0bd1d64947a71c5492a29be7c8dbf /utils/gen_adldata/file_formats | |
parent | 0a003c8bc12514a5586f2f0e40559fcbf6607883 (diff) | |
parent | 0e2807a9d4c8c900e85c9b33ba96c69a82c58a68 (diff) | |
download | libADLMIDI-1ab34e88a326c396fbb42c503eb4ffa56fa0a148.tar.gz libADLMIDI-1ab34e88a326c396fbb42c503eb4ffa56fa0a148.tar.bz2 libADLMIDI-1ab34e88a326c396fbb42c503eb4ffa56fa0a148.zip |
Merge branch 'master' into stable
Diffstat (limited to 'utils/gen_adldata/file_formats')
-rw-r--r-- | utils/gen_adldata/file_formats/load_ail.h | 1 | ||||
-rw-r--r-- | utils/gen_adldata/file_formats/load_bisqwit.h | 1 | ||||
-rw-r--r-- | utils/gen_adldata/file_formats/load_bnk.h | 1 | ||||
-rw-r--r-- | utils/gen_adldata/file_formats/load_bnk2.h | 1 | ||||
-rw-r--r-- | utils/gen_adldata/file_formats/load_ibk.h | 1 | ||||
-rw-r--r-- | utils/gen_adldata/file_formats/load_jv.h | 1 | ||||
-rw-r--r-- | utils/gen_adldata/file_formats/load_op2.h | 1 | ||||
-rw-r--r-- | utils/gen_adldata/file_formats/load_tmb.h | 1 | ||||
-rw-r--r-- | utils/gen_adldata/file_formats/load_wopl.h | 1 |
9 files changed, 9 insertions, 0 deletions
diff --git a/utils/gen_adldata/file_formats/load_ail.h b/utils/gen_adldata/file_formats/load_ail.h index e63b1d7..7f4d7ea 100644 --- a/utils/gen_adldata/file_formats/load_ail.h +++ b/utils/gen_adldata/file_formats/load_ail.h @@ -91,6 +91,7 @@ static bool LoadMiles(const char *fn, unsigned bank, const char *prefix) tmp2.pseudo4op = false; tmp2.real4op = (inscount > 1); tmp2.voice2_fine_tune = 0.0; + tmp2.midi_velocity_offset = 0; std::string name; if(midi_index >= 0) name = std::string(1, '\377') + MidiInsName[midi_index]; size_t resno = InsertIns(tmp[0], tmp[1], tmp2, name, name2, twoOp); diff --git a/utils/gen_adldata/file_formats/load_bisqwit.h b/utils/gen_adldata/file_formats/load_bisqwit.h index f5f73dc..3283aa9 100644 --- a/utils/gen_adldata/file_formats/load_bisqwit.h +++ b/utils/gen_adldata/file_formats/load_bisqwit.h @@ -26,6 +26,7 @@ static bool LoadBisqwit(const char *fn, unsigned bank, const char *prefix) tmp2.notenum = (uint8_t)std::fgetc(fp); tmp2.pseudo4op = false; tmp2.voice2_fine_tune = 0.0; + tmp2.midi_velocity_offset = 0; insdata tmp[2]; for(int side = 0; side < 2; ++side) diff --git a/utils/gen_adldata/file_formats/load_bnk.h b/utils/gen_adldata/file_formats/load_bnk.h index aa7701f..dfa066e 100644 --- a/utils/gen_adldata/file_formats/load_bnk.h +++ b/utils/gen_adldata/file_formats/load_bnk.h @@ -110,6 +110,7 @@ static bool LoadBNK(const char *fn, unsigned bank, const char *prefix, bool is_f tmp2.pseudo4op = false; tmp2.real4op = false; tmp2.voice2_fine_tune = 0.0; + tmp2.midi_velocity_offset = 0; if(is_fat) tmp.data[10] ^= 1; diff --git a/utils/gen_adldata/file_formats/load_bnk2.h b/utils/gen_adldata/file_formats/load_bnk2.h index 4772da5..a55551a 100644 --- a/utils/gen_adldata/file_formats/load_bnk2.h +++ b/utils/gen_adldata/file_formats/load_bnk2.h @@ -88,6 +88,7 @@ static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix, tmp2.pseudo4op = false; tmp2.real4op = false; tmp2.voice2_fine_tune = 0.0; + tmp2.midi_velocity_offset = 0; if(xxP24NNN & 8) { diff --git a/utils/gen_adldata/file_formats/load_ibk.h b/utils/gen_adldata/file_formats/load_ibk.h index 12fa520..934fb67 100644 --- a/utils/gen_adldata/file_formats/load_ibk.h +++ b/utils/gen_adldata/file_formats/load_ibk.h @@ -63,6 +63,7 @@ static bool LoadIBK(const char *fn, unsigned bank, const char *prefix, bool perc tmp2.pseudo4op = false; tmp2.real4op = false; tmp2.voice2_fine_tune = 0.0; + tmp2.midi_velocity_offset = 0; size_t resno = InsertIns(tmp, tmp2, std::string(1, '\377') + name, name2); SetBank(bank, (unsigned int)gmno, resno); diff --git a/utils/gen_adldata/file_formats/load_jv.h b/utils/gen_adldata/file_formats/load_jv.h index 35caead..ad840d8 100644 --- a/utils/gen_adldata/file_formats/load_jv.h +++ b/utils/gen_adldata/file_formats/load_jv.h @@ -73,6 +73,7 @@ static bool LoadJunglevision(const char *fn, unsigned bank, const char *prefix) tmp2.pseudo4op = false; tmp2.real4op = (data[offset] != 0); tmp2.voice2_fine_tune = 0.0; + tmp2.midi_velocity_offset = 0; while(tmp2.notenum && tmp2.notenum < 20) { diff --git a/utils/gen_adldata/file_formats/load_op2.h b/utils/gen_adldata/file_formats/load_op2.h index 48b7eae..7c68dd8 100644 --- a/utils/gen_adldata/file_formats/load_op2.h +++ b/utils/gen_adldata/file_formats/load_op2.h @@ -110,6 +110,7 @@ static bool LoadDoom(const char *fn, unsigned bank, const char *prefix) tmp2.pseudo4op = false; tmp2.real4op = false; tmp2.voice2_fine_tune = 0.0; + tmp2.midi_velocity_offset = 0; while(tmp2.notenum && tmp2.notenum < 20) { tmp2.notenum += 12; diff --git a/utils/gen_adldata/file_formats/load_tmb.h b/utils/gen_adldata/file_formats/load_tmb.h index 5b38433..1d999d1 100644 --- a/utils/gen_adldata/file_formats/load_tmb.h +++ b/utils/gen_adldata/file_formats/load_tmb.h @@ -52,6 +52,7 @@ static bool LoadTMB(const char *fn, unsigned bank, const char *prefix) tmp2.pseudo4op = false; tmp2.real4op = false; tmp2.voice2_fine_tune = 0.0; + tmp2.midi_velocity_offset = (int8_t)data[offset + 12]; std::string name; if(midi_index >= 0) name = std::string(1, '\377') + MidiInsName[midi_index]; diff --git a/utils/gen_adldata/file_formats/load_wopl.h b/utils/gen_adldata/file_formats/load_wopl.h index fe4865d..24b303e 100644 --- a/utils/gen_adldata/file_formats/load_wopl.h +++ b/utils/gen_adldata/file_formats/load_wopl.h @@ -171,6 +171,7 @@ static bool LoadWopl(const char *fn, unsigned bank, const char *prefix) tmp2.pseudo4op = (flags & (uint8_t)WOPL_Flags::Mode_DoubleVoice) != 0; tmp2.real4op = real4op && !tmp2.pseudo4op; tmp2.voice2_fine_tune = 0; + tmp2.midi_velocity_offset = (int8_t)data[offset + 36]; tmp[0].diff = false; tmp[1].diff = real4op && !tmp2.pseudo4op; |