aboutsummaryrefslogtreecommitdiff
path: root/utils/gen_adldata/file_formats
diff options
context:
space:
mode:
Diffstat (limited to 'utils/gen_adldata/file_formats')
-rw-r--r--utils/gen_adldata/file_formats/common.h28
-rw-r--r--utils/gen_adldata/file_formats/load_ail.h179
-rw-r--r--utils/gen_adldata/file_formats/load_bisqwit.h54
-rw-r--r--utils/gen_adldata/file_formats/load_bnk.h49
-rw-r--r--utils/gen_adldata/file_formats/load_bnk2.h61
-rw-r--r--utils/gen_adldata/file_formats/load_ea.h57
-rw-r--r--utils/gen_adldata/file_formats/load_ibk.h52
-rw-r--r--utils/gen_adldata/file_formats/load_jv.h75
-rw-r--r--utils/gen_adldata/file_formats/load_op2.h117
-rw-r--r--utils/gen_adldata/file_formats/load_tmb.h44
-rw-r--r--utils/gen_adldata/file_formats/load_wopl.h130
11 files changed, 477 insertions, 369 deletions
diff --git a/utils/gen_adldata/file_formats/common.h b/utils/gen_adldata/file_formats/common.h
index d06059e..644e7a6 100644
--- a/utils/gen_adldata/file_formats/common.h
+++ b/utils/gen_adldata/file_formats/common.h
@@ -1,3 +1,4 @@
+#pragma once
#ifndef COMMON_H
#define COMMON_H
@@ -18,6 +19,14 @@ inline int16_t toSint16BE(const uint8_t *arr)
return num;
}
+inline int16_t toSint16LE(const uint8_t *arr)
+{
+ int16_t num = *reinterpret_cast<const int8_t *>(&arr[1]);
+ num *= 1 << 8;
+ num |= static_cast<int16_t>(arr[0]) & 0x00FF;
+ return num;
+}
+
inline uint16_t toUint16LE(const uint8_t *arr)
{
uint16_t num = arr[0];
@@ -25,4 +34,23 @@ inline uint16_t toUint16LE(const uint8_t *arr)
return num;
}
+inline uint32_t toUint32LE(const uint8_t *arr)
+{
+ uint32_t num = arr[0];
+ num |= (static_cast<uint32_t>(arr[1] << 8) & 0x0000FF00);
+ num |= (static_cast<uint32_t>(arr[2] << 16) & 0x00FF0000);
+ num |= (static_cast<uint32_t>(arr[3] << 24) & 0xFF000000);
+ return num;
+}
+
+inline int32_t toSint32LE(const uint8_t *arr)
+{
+ int32_t num = *reinterpret_cast<const int8_t *>(&arr[3]);
+ num *= 1 << 24;
+ num |= (static_cast<int32_t>(arr[2]) << 16) & 0x00FF0000;
+ num |= (static_cast<int32_t>(arr[1]) << 8) & 0x0000FF00;
+ num |= static_cast<int32_t>(arr[0]) & 0x000000FF;
+ return num;
+}
+
#endif // COMMON_H
diff --git a/utils/gen_adldata/file_formats/load_ail.h b/utils/gen_adldata/file_formats/load_ail.h
index 80ca8ad..d6fa014 100644
--- a/utils/gen_adldata/file_formats/load_ail.h
+++ b/utils/gen_adldata/file_formats/load_ail.h
@@ -3,17 +3,26 @@
#include "../progs_cache.h"
#include "../midi_inst_list.h"
+#include "common.h"
-static bool LoadMiles(const char *fn, unsigned bank, const char *prefix)
+struct GTL_Head // GTL file header entry structure
{
- #ifdef HARD_BANKS
+ uint8_t patch = 0;
+ uint8_t bank = 0;
+ uint32_t offset = 0;
+};
+
+bool BankFormats::LoadMiles(BanksDump &db, const char *fn, unsigned bank,
+ const std::string &bankTitle, const char *prefix)
+{
+#ifdef HARD_BANKS
writeIni("AIL", fn, prefix, bank, INI_Both);
- #endif
+#endif
FILE *fp = std::fopen(fn, "rb");
if(!fp)
return false;
std::fseek(fp, 0, SEEK_END);
- std::vector<unsigned char> data(size_t(std::ftell(fp)));
+ std::vector<uint8_t> data(size_t(std::ftell(fp)));
std::rewind(fp);
if(std::fread(&data[0], 1, data.size(), fp) != data.size())
{
@@ -22,90 +31,152 @@ static bool LoadMiles(const char *fn, unsigned bank, const char *prefix)
}
std::fclose(fp);
- for(unsigned a = 0; a < 2000; ++a)
+ GTL_Head head;
+ std::vector<GTL_Head> heads;
+ uint_fast8_t max_bank_number = 0;
+ heads.reserve(256);
+ uint8_t *data_pos = data.data();
+ uint8_t *data_end = data.data() + data.size();
+ do
{
- unsigned gm_patch = data[a * 6 + 0];
- unsigned gm_bank = data[a * 6 + 1];
- unsigned offset = *(unsigned *)&data[a * 6 + 2];
+ if((data_end - data_pos) < 6)
+ return false;
+
+ head.patch = data_pos[0];
+ head.bank = data_pos[1];
+ head.offset = toUint32LE(data_pos + 2);
- if(gm_patch == 0xFF)
+ if((head.patch == 0xFF) || (head.bank == 0xFF))
break;
- int gmno = gm_bank == 0x7F ? int(gm_patch + 0x80) : int(gm_patch);
- int midi_index = gmno < 128 ? gmno
- : gmno < 128 + 35 ? -1
- : gmno < 128 + 88 ? gmno - 35
- : -1;
- unsigned length = data[offset] + data[offset + 1] * 256;
- signed char notenum = ((signed char)data[offset + 2]);
+ if(head.patch > 127)//Patch ID is more than 127
+ return false;
+
+ if((head.bank != 0x7F) && (head.bank > max_bank_number) )
+ max_bank_number = head.bank;
- /*printf("%02X %02X %08X ", gmnumber,gmnumber2, offset);
- for(unsigned b=0; b<length; ++b)
+ heads.push_back(head);
+ data_pos += 6;
+ }
+ while(data_pos < data_end);
+
+ size_t bankDb = db.initBank(bank, bankTitle, BanksDump::BankEntry::SETUP_AIL);
+
+ std::vector<BanksDump::MidiBank> bnkMelodic;
+ bnkMelodic.resize(max_bank_number + 1, BanksDump::MidiBank());
+ BanksDump::MidiBank bnkPercussion;
+
+ {
+ uint8_t bank_lsb_counter = 0;
+ uint8_t bank_msb_counter = 0;
+ for(BanksDump::MidiBank &b : bnkMelodic)
{
- if(b > 3 && (b-3)%11 == 0) printf("\n ");
- printf("%02X ", data[offset+b]);
+ b.lsb = bank_lsb_counter++;
+ b.msb = bank_msb_counter;
+ if(bank_lsb_counter == 0)
+ bank_msb_counter++;
}
- printf("\n");*/
+ }
- if(gm_bank != 0 && gm_bank != 0x7F)
- continue;
+ uint32_t totalInsts = static_cast<uint32_t>(heads.size());
+ for(uint32_t i = 0; i < totalInsts; i++)
+ {
+ GTL_Head &h = heads[i];
+ bool isPerc = (h.bank == 0x7F);
+ // int gmPatchId = isPerc ? h.patch : (h.patch + (h.bank * 128));
+ unsigned offset = h.offset;
+
+ BanksDump::MidiBank &bnk = isPerc ? bnkPercussion : bnkMelodic[h.bank];
+
+ int gmno = isPerc ? int(h.patch + 0x80) : int(h.patch);
+// int midi_index = gmno < 128 ? gmno
+// : gmno < 128 + 35 ? -1
+// : gmno < 128 + 88 ? gmno - 35
+// : -1;
+
+ unsigned length = data[offset] + data[offset + 1] * 256;
+ signed char notenum = ((signed char)data[offset + 2]);
+
+ BanksDump::InstrumentEntry inst;
+ BanksDump::Operator ops[5];
char name2[512];
sprintf(name2, "%s%c%u", prefix,
(gmno < 128 ? 'M' : 'P'), gmno & 127);
- insdata tmp[200];
+ InstBuffer tmp[200];
const unsigned inscount = (length - 3) / 11;
- bool twoOp = (inscount == 1);
+// bool twoOp = (inscount == 1);
for(unsigned i = 0; i < inscount; ++i)
{
+ if(i >= 2)
+ break;
unsigned o = offset + 3 + i * 11;
- tmp[i].finetune = (gmno < 128 && i == 0) ? notenum : 0;
- tmp[i].diff = (i == 1);
- tmp[i].data[0] = data[o + 0]; // 20
- tmp[i].data[8] = data[o + 1]; // 40 (vol)
- tmp[i].data[2] = data[o + 2]; // 60
- tmp[i].data[4] = data[o + 3]; // 80
- tmp[i].data[6] = data[o + 4]; // E0
- tmp[i].data[1] = data[o + 6]; // 23
- tmp[i].data[9] = data[o + 7]; // 43 (vol)
- tmp[i].data[3] = data[o + 8]; // 63
- tmp[i].data[5] = data[o + 9]; // 83
- tmp[i].data[7] = data[o + 10]; // E3
+// tmp[i].finetune = (gmno < 128 && i == 0) ? notenum : 0;
+// tmp[i].diff = (i == 1);
+
+ uint8_t temp[11] = {0};
+ if(o < data.size())
+ {
+ size_t count = data.size() - o;
+ count = (count > sizeof(temp)) ? sizeof(temp) : count;
+ std::memcpy(temp, &data[o], count);
+ }
+
+ tmp[i].data[0] = temp[0]; // 20
+ tmp[i].data[8] = temp[1]; // 40 (vol)
+ tmp[i].data[2] = temp[2]; // 60
+ tmp[i].data[4] = temp[3]; // 80
+ tmp[i].data[6] = temp[4]; // E0
+ tmp[i].data[1] = temp[6]; // 23
+ tmp[i].data[9] = temp[7]; // 43 (vol)
+ tmp[i].data[3] = temp[8]; // 63
+ tmp[i].data[5] = temp[9]; // 83
+ tmp[i].data[7] = temp[10]; // E3
unsigned fb_c = data[offset + 3 + 5];
tmp[i].data[10] = uint8_t(fb_c);
if(i == 1)
{
+ inst.instFlags |= BanksDump::InstrumentEntry::WOPL_Ins_4op;
tmp[0].data[10] = fb_c & 0x0F;
tmp[1].data[10] = uint8_t((fb_c & 0x0E) | (fb_c >> 7));
}
+ db.toOps(tmp[i].d, ops, i * 2);
}
if(inscount <= 2)
{
- struct ins tmp2;
- tmp2.notenum = gmno < 128 ? 0 : (unsigned char)notenum;
- tmp2.pseudo4op = false;
- tmp2.real4op = (inscount > 1);
- tmp2.voice2_fine_tune = 0.0;
- tmp2.midi_velocity_offset = 0;
- tmp2.rhythmModeDrum = 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);
- SetBank(bank, (unsigned int)gmno, resno);
+// struct ins tmp2;
+// tmp2.notenum = gmno < 128 ? 0 : (unsigned char)notenum;
+// tmp2.pseudo4op = false;
+// tmp2.real4op = (inscount > 1);
+// tmp2.voice2_fine_tune = 0.0;
+// tmp2.midi_velocity_offset = 0;
+// tmp2.rhythmModeDrum = 0;
+
+// std::string name;
+// if(midi_index >= 0) name = std::string(1, '\377') + MidiInsName[midi_index];
+// if(h.bank == 0 || h.bank == 0x7F)
+// {
+// size_t resno = InsertIns(tmp[0], tmp[1], tmp2, name, name2, twoOp);
+// SetBank(bank, (unsigned int)gmno, resno);
+// }
+ //---------------------------------------------------------------
+ inst.percussionKeyNumber = isPerc ? static_cast<uint_fast8_t>(notenum) : 0;
+ inst.noteOffset1 = isPerc ? 0 : notenum;
+ unsigned fb_c = data[offset + 3 + 5];
+ inst.fbConn = (static_cast<uint_fast16_t>(fb_c & 0x0F)) |
+ (static_cast<uint_fast16_t>((fb_c & 0x0E) | (fb_c >> 7)) << 8);
+ db.addInstrument(bnk, h.patch, inst, ops, fn);
}
}
- AdlBankSetup setup;
- setup.volumeModel = VOLUME_Generic;
- setup.deepTremolo = true;
- setup.deepVibrato = true;
- setup.scaleModulators = false;
- SetBankSetup(bank, setup);
+ for(auto &b : bnkMelodic)
+ db.addMidiBank(bankDb, false, b);
+ db.addMidiBank(bankDb, true, bnkPercussion);
return true;
}
diff --git a/utils/gen_adldata/file_formats/load_bisqwit.h b/utils/gen_adldata/file_formats/load_bisqwit.h
index 9749a76..63d133f 100644
--- a/utils/gen_adldata/file_formats/load_bisqwit.h
+++ b/utils/gen_adldata/file_formats/load_bisqwit.h
@@ -4,36 +4,41 @@
#include "../progs_cache.h"
#include "../midi_inst_list.h"
-static bool LoadBisqwit(const char *fn, unsigned bank, const char *prefix)
+bool BankFormats::LoadBisqwit(BanksDump &db, const char *fn, unsigned bank, const std::string &bankTitle, const char *prefix)
{
- #ifdef HARD_BANKS
+#ifdef HARD_BANKS
writeIni("Bisqwit", fn, prefix, bank, INI_Both);
- #endif
+#endif
FILE *fp = std::fopen(fn, "rb");
if(!fp)
return false;
- for(uint32_t a = 0; a < 256; ++a)
+ size_t bankDb = db.initBank(bank, bankTitle, BanksDump::BankEntry::SETUP_Generic);
+ BanksDump::MidiBank bnkMelodique;
+ BanksDump::MidiBank bnkPercussion;
+
+ for(uint32_t a = 0, patchId = 0; a < 256; ++a, patchId++)
{
//unsigned offset = a * 25;
uint32_t gmno = a;
+ bool isPercussion = gmno >= 128;
int32_t midi_index = gmno < 128 ? int32_t(gmno)
: gmno < 128 + 35 ? -1
: gmno < 128 + 88 ? int32_t(gmno - 35)
: -1;
+ if(patchId == 128)
+ patchId = 0;
+
+ BanksDump::MidiBank &bnk = isPercussion ? bnkPercussion : bnkMelodique;
+ BanksDump::InstrumentEntry inst;
+ BanksDump::Operator ops[5];
- struct ins tmp2;
- tmp2.notenum = (uint8_t)std::fgetc(fp);
- tmp2.pseudo4op = false;
- tmp2.voice2_fine_tune = 0.0;
- tmp2.midi_velocity_offset = 0;
- tmp2.rhythmModeDrum = 0;
+ uint8_t notenum = static_cast<uint8_t>(std::fgetc(fp));
- insdata tmp[2];
+ InstBuffer tmp[2];
for(int side = 0; side < 2; ++side)
{
- tmp[side].finetune = (int8_t)std::fgetc(fp);
- tmp[side].diff = false;
+ std::fseek(fp, +1, SEEK_CUR); // skip first byte, unused "fine tune"
if(std::fread(tmp[side].data, 1, 11, fp) != 11)
return false;
}
@@ -45,19 +50,22 @@ static bool LoadBisqwit(const char *fn, unsigned bank, const char *prefix)
sprintf(name2, "%s%c%u", prefix,
(gmno < 128 ? 'M' : 'P'), gmno & 127);
- tmp[1].diff = (tmp[0] != tmp[1]);
- tmp2.real4op = tmp[1].diff;
- size_t resno = InsertIns(tmp[0], tmp[1], tmp2, name, name2, (tmp[0] == tmp[1]));
- SetBank(bank, gmno, resno);
+ db.toOps(tmp[0].d, ops, 0);
+ if(tmp[0].d != tmp[1].d)
+ {
+ inst.instFlags |= BanksDump::InstrumentEntry::WOPL_Ins_4op;
+ db.toOps(tmp[1].d, ops, 2);
+ }
+
+ inst.fbConn = uint_fast16_t(tmp[0].data[10]) | (uint_fast16_t(tmp[1].data[10]) << 8);
+ inst.percussionKeyNumber = a >= 128 ? notenum : 0;
+ inst.noteOffset1 = a < 128 ? notenum : 0;
+ db.addInstrument(bnk, patchId, inst, ops, fn);
}
std::fclose(fp);
- AdlBankSetup setup;
- setup.volumeModel = VOLUME_Generic;
- setup.deepTremolo = true;
- setup.deepVibrato = true;
- setup.scaleModulators = false;
- SetBankSetup(bank, setup);
+ db.addMidiBank(bankDb, false, bnkMelodique);
+ db.addMidiBank(bankDb, true, bnkPercussion);
return true;
}
diff --git a/utils/gen_adldata/file_formats/load_bnk.h b/utils/gen_adldata/file_formats/load_bnk.h
index f1412ba..29f5494 100644
--- a/utils/gen_adldata/file_formats/load_bnk.h
+++ b/utils/gen_adldata/file_formats/load_bnk.h
@@ -7,11 +7,13 @@
#include <cstdint>
#include <string>
-static bool LoadBNK(const char *fn, unsigned bank, const char *prefix, bool is_fat, bool percussive)
+bool BankFormats::LoadBNK(BanksDump &db, const char *fn, unsigned bank,
+ const std::string &bankTitle, const char *prefix,
+ bool is_fat, bool percussive)
{
- #ifdef HARD_BANKS
+#ifdef HARD_BANKS
writeIni("HMI", fn, prefix, bank, percussive ? INI_Drums : INI_Melodic);
- #endif
+#endif
FILE *fp = std::fopen(fn, "rb");
if(!fp)
return false;
@@ -25,6 +27,9 @@ static bool LoadBNK(const char *fn, unsigned bank, const char *prefix, bool is_f
}
std::fclose(fp);
+ size_t bankDb = db.initBank(bank, bankTitle, BanksDump::BankEntry::SETUP_Generic);
+ BanksDump::MidiBank bnk;
+
/*printf("%s:\n", fn);*/
//unsigned short version = *(short*)&data[0]; // major,minor (2 bytes)
// "ADLIB-" (6 bytes)
@@ -80,7 +85,10 @@ static bool LoadBNK(const char *fn, unsigned bank, const char *prefix, bool is_f
else
sprintf(name2, "%s%u", prefix, n);
- insdata tmp;
+ BanksDump::InstrumentEntry inst;
+ BanksDump::Operator ops[5];
+
+ InstBuffer tmp;
tmp.data[0] = uint8_t(
(op1[ 9] << 7) // TREMOLO FLAG
+ (op1[10] << 6) // VIBRATO FLAG
@@ -102,30 +110,18 @@ static bool LoadBNK(const char *fn, unsigned bank, const char *prefix, bool is_f
tmp.data[8] = op1[0] * 0x40 + op1[8]; // KSL , LEVEL
tmp.data[9] = op2[0] * 0x40 + op2[8]; // KSL , LEVEL
tmp.data[10] = op1[2] * 2 + op1[12]; // FEEDBACK, ADDITIVEFLAG
- tmp.finetune = 0;
- tmp.diff = false;
+
// Note: op2[2] and op2[12] are unused and contain garbage.
- ins tmp2;
- tmp2.notenum = is_fat ? voice_num : (percussive ? usage_flag : 0);
- tmp2.pseudo4op = false;
- tmp2.real4op = false;
- tmp2.voice2_fine_tune = 0.0;
- tmp2.midi_velocity_offset = 0;
- tmp2.rhythmModeDrum = 0;
- if(is_fat) tmp.data[10] ^= 1;
+ if(is_fat)
+ tmp.data[10] ^= 1;
- size_t resno = InsertIns(tmp, tmp2, std::string(1, '\377') + name, name2);
+ db.toOps(tmp.d, ops, 0);
+ inst.percussionKeyNumber = is_fat ? voice_num : (percussive ? usage_flag : 0);
+ inst.setFbConn(op1[2] * 2 + op1[12]);
if(!is_fat)
- {
- SetBank(bank, (unsigned int)gmno, resno);
- }
- else
- {
- if(name[2] == 'O' || name[1] == 'M') SetBank(bank + 0, (unsigned int)gmno, resno);
- if(name[2] == 'S' || name[1] == 'M') SetBank(bank + 1, (unsigned int)gmno, resno);
- }
+ db.addInstrument(bnk, n & 127, inst, ops, fn);
/*
for(unsigned p=0; p<30; ++p)
@@ -151,12 +147,7 @@ static bool LoadBNK(const char *fn, unsigned bank, const char *prefix, bool is_f
*/
}
- AdlBankSetup setup;
- setup.volumeModel = VOLUME_Generic;
- setup.deepTremolo = false;
- setup.deepVibrato = false;
- setup.scaleModulators = false;
- SetBankSetup(bank, setup);
+ db.addMidiBank(bankDb, percussive, bnk);
return true;
}
diff --git a/utils/gen_adldata/file_formats/load_bnk2.h b/utils/gen_adldata/file_formats/load_bnk2.h
index 072712c..46ba604 100644
--- a/utils/gen_adldata/file_formats/load_bnk2.h
+++ b/utils/gen_adldata/file_formats/load_bnk2.h
@@ -8,9 +8,10 @@ inline int stdstoi(const std::string& str)
return std::atoi(str.c_str());
}
-static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix,
- const std::string &melo_filter,
- const std::string &perc_filter)
+bool BankFormats::LoadBNK2(BanksDump &db, const char *fn, unsigned bank,
+ const std::string &bankTitle, const char *prefix,
+ const std::string &melo_filter,
+ const std::string &perc_filter)
{
#ifdef HARD_BANKS
writeIni("AdLibGold", fn, prefix, bank, INI_Both, melo_filter.c_str(), perc_filter.c_str());
@@ -28,6 +29,10 @@ static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix,
}
std::fclose(fp);
+ size_t bankDb = db.initBank(bank, bankTitle, BanksDump::BankEntry::SETUP_Generic);
+ BanksDump::MidiBank bnkMelodic;
+ BanksDump::MidiBank bnkPercussion;
+
unsigned short ins_entries = *(unsigned short *)&data[28 + 2 + 10];
unsigned char *records = &data[48];
@@ -47,13 +52,24 @@ static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix,
}
int gmno = 0;
+ int patchId = 0;
+ bool isPercussion = false;
if(name.substr(0, melo_filter.size()) == melo_filter)
- gmno = stdstoi(name.substr(melo_filter.size()));
+ {
+ gmno = patchId = stdstoi(name.substr(melo_filter.size()));
+ isPercussion = false;
+ }
else if(name.substr(0, perc_filter.size()) == perc_filter)
- gmno = stdstoi(name.substr(perc_filter.size())) + 128;
+ {
+ patchId = stdstoi(name.substr(perc_filter.size()));
+ gmno = patchId + 128;
+ isPercussion = true;
+ }
else
continue;
+ BanksDump::MidiBank &bnk = isPercussion ? bnkPercussion : bnkMelodic;
+
const unsigned char *insdata = &data[size_t(offset2)];
const unsigned char *ops[4] = { insdata + 0, insdata + 6, insdata + 12, insdata + 18 };
unsigned char C4xxxFFFC = insdata[24];
@@ -64,7 +80,10 @@ static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix,
char name2[512];
sprintf(name2, "%s%c%u", prefix, (gmno & 128) ? 'P' : 'M', gmno & 127);
- struct insdata tmp[2];
+ BanksDump::InstrumentEntry inst;
+ BanksDump::Operator opsD[5];
+
+ InstBuffer tmp[2];
for(unsigned a = 0; a < 2; ++a)
{
tmp[a].data[0] = ops[a * 2 + 0][0];
@@ -77,42 +96,30 @@ static bool LoadBNK2(const char *fn, unsigned bank, const char *prefix,
tmp[a].data[7] = ops[a * 2 + 1][4] & 0x07;
tmp[a].data[8] = ops[a * 2 + 0][1];
tmp[a].data[9] = ops[a * 2 + 1][1];
- tmp[a].finetune = (int8_t)TTTTTTTT;
- tmp[a].diff = false;
+ db.toOps(tmp[a].d, opsD, a * 2);
}
tmp[0].data[10] = C4xxxFFFC & 0x0F;
tmp[1].data[10] = (tmp[0].data[10] & 0x0E) | (C4xxxFFFC >> 7);
- ins tmp2;
- tmp2.notenum = (gmno & 128) ? 35 : 0;
- tmp2.pseudo4op = false;
- tmp2.real4op = false;
- tmp2.voice2_fine_tune = 0.0;
- tmp2.midi_velocity_offset = 0;
- tmp2.rhythmModeDrum = 0;
+ inst.setFbConn(C4xxxFFFC & 0x0F, (tmp[0].data[10] & 0x0E) | (C4xxxFFFC >> 7));
+ inst.noteOffset1 = (int8_t)TTTTTTTT;
+ inst.percussionKeyNumber = (gmno & 128) ? 35 : 0;
if(xxP24NNN & 8)
{
// dual-op
- tmp2.real4op = true;
- tmp[1].diff = true;
- size_t resno = InsertIns(tmp[0], tmp[1], tmp2, std::string(1, '\377') + name, name2);
- SetBank(bank, (unsigned int)gmno, resno);
+ inst.instFlags |= BanksDump::InstrumentEntry::WOPL_Ins_4op;
+ db.addInstrument(bnk, patchId, inst, opsD, fn);
}
else
{
// single-op
- size_t resno = InsertIns(tmp[0], tmp2, std::string(1, '\377') + name, name2);
- SetBank(bank, (unsigned int)gmno, resno);
+ db.addInstrument(bnk, patchId, inst, opsD, fn);
}
}
- AdlBankSetup setup;
- setup.volumeModel = VOLUME_Generic;
- setup.deepTremolo = false;
- setup.deepVibrato = false;
- setup.scaleModulators = false;
- SetBankSetup(bank, setup);
+ db.addMidiBank(bankDb, false, bnkMelodic);
+ db.addMidiBank(bankDb, true, bnkPercussion);
return true;
}
diff --git a/utils/gen_adldata/file_formats/load_ea.h b/utils/gen_adldata/file_formats/load_ea.h
index c217c09..5e5711e 100644
--- a/utils/gen_adldata/file_formats/load_ea.h
+++ b/utils/gen_adldata/file_formats/load_ea.h
@@ -4,17 +4,22 @@
#include "../progs_cache.h"
#include "../midi_inst_list.h"
-static bool LoadEA(const char *fn, unsigned bank, const char *prefix)
+bool BankFormats::LoadEA(BanksDump &db, const char *fn, unsigned bank,
+ const std::string &bankTitle, const char *prefix)
{
FILE *fp = std::fopen(fn, "rb");
if(!fp)
return false;
+ size_t bankDb = db.initBank(bank, bankTitle, BanksDump::BankEntry::SETUP_CMF);
+ BanksDump::MidiBank bnkMelodic = db.midiBanks[db.banks[0].melodic[0]];
+ BanksDump::MidiBank bnkPercussion = db.midiBanks[db.banks[0].percussion[0]];
+
// Copy all instruments from bank 0
- for(unsigned gmno = 0; gmno < 128; ++gmno)
- progs[bank][gmno] = progs[0][gmno];
- for(unsigned gmno = 35; gmno < 80; ++gmno)
- progs[bank][0x80 + gmno] = progs[0][0x80 + gmno];
+// for(unsigned gmno = 0; gmno < 128; ++gmno)
+// progs[bank][gmno] = progs[0][gmno];
+// for(unsigned gmno = 35; gmno < 80; ++gmno)
+// progs[bank][0x80 + gmno] = progs[0][0x80 + gmno];
uint16_t sources[20 + 8];
// Copy also the unused instruments
@@ -61,7 +66,10 @@ static bool LoadEA(const char *fn, unsigned bank, const char *prefix)
return false;
}
- insdata tmp;
+ BanksDump::InstrumentEntry inst;
+ BanksDump::Operator ops[5];
+
+ InstBuffer tmp;
tmp.data[0] = bytes[0]; // reg 0x20: modulator AM/VIG/EG/KSR
tmp.data[8] = bytes[1]; // reg 0x40: modulator ksl/attenuation
tmp.data[2] = bytes[2]; // reg 0x60: modulator attack/decay
@@ -78,15 +86,12 @@ static bool LoadEA(const char *fn, unsigned bank, const char *prefix)
tmp.data[10] = bytes[8]; // reg 0xC0 (feedback and connection)
- tmp.finetune = int8_t(bytes[9] + 12); // finetune
tmp.data[6] = 0; // reg 0xE0: modulator, never seems to be set
tmp.data[7] = 0; // reg 0xE0: carrier, never seems to be set
- ins tmp2{};
- tmp2.notenum = 0;
- tmp2.pseudo4op = false;
- tmp2.real4op = false;
- tmp2.rhythmModeDrum = 0;
+ db.toOps(tmp.d, ops, 0);
+ inst.setFbConn(bytes[8]);
+ inst.noteOffset1 = int8_t(bytes[9] + 12);
std::string name;
char name2[512];
@@ -98,42 +103,38 @@ static bool LoadEA(const char *fn, unsigned bank, const char *prefix)
{
snprintf(name2, 512, "%sunk%04X", prefix, offset);
}
- size_t resno = InsertIns(tmp, tmp2, std::string(1, '\377') + name, name2);
- SetBank(bank, gmno, resno);
+
+ db.addInstrument(bnkMelodic, gmno, inst, ops, fn);
if(gmno == 10)
{
- /*tmp.finetune=0;*/ tmp2.notenum = 0x49;
- SetBank(bank, 0x80 + 0x36, InsertIns(tmp, tmp2, std::string(1, '\377') + MidiInsName[0x80 + 0x36 - 35], std::string(1, '\377') + prefix + "P54"));
+ inst.percussionKeyNumber = 0x49;
+ db.addInstrument(bnkPercussion, 0x36, inst, ops, fn);
}
if(gmno == 18)
{
- /*tmp.finetune=0;*/ tmp2.notenum = 0x17;
- SetBank(bank, 0x80 + 0x2A, InsertIns(tmp, tmp2, std::string(1, '\377') + MidiInsName[0x80 + 0x2A - 35], std::string(1, '\377') + prefix + "P42"));
+ inst.percussionKeyNumber = 0x17;
+ db.addInstrument(bnkPercussion, 0x2A, inst, ops, fn);
}
if(gmno == 16)
{
- /*tmp.finetune=0;*/ tmp2.notenum = 0x0C;
- SetBank(bank, 0x80 + 0x24, InsertIns(tmp, tmp2, std::string(1, '\377') + MidiInsName[0x80 + 0x24 - 35], std::string(1, '\377') + prefix + "P36"));
+ inst.percussionKeyNumber = 0x0C;
+ db.addInstrument(bnkPercussion, 0x24, inst, ops, fn);
}
if(gmno == 17)
{
- /*tmp.finetune=0;*/ tmp2.notenum = 0x01;
- SetBank(bank, 0x80 + 0x26, InsertIns(tmp, tmp2, std::string(1, '\377') + MidiInsName[0x80 + 0x26 - 35], std::string(1, '\377') + prefix + "P38"));
+ inst.percussionKeyNumber = 0x01;
+ db.addInstrument(bnkPercussion, 0x26, inst, ops, fn);
}
}
std::fclose(fp);
- AdlBankSetup setup;
- setup.volumeModel = VOLUME_CMF;
- setup.deepTremolo = false;
- setup.deepVibrato = false;
- setup.scaleModulators = false;
- SetBankSetup(bank, setup);
+ db.addMidiBank(bankDb, false, bnkMelodic);
+ db.addMidiBank(bankDb, true, bnkPercussion);
return true;
}
diff --git a/utils/gen_adldata/file_formats/load_ibk.h b/utils/gen_adldata/file_formats/load_ibk.h
index 28177c7..f95a244 100644
--- a/utils/gen_adldata/file_formats/load_ibk.h
+++ b/utils/gen_adldata/file_formats/load_ibk.h
@@ -3,11 +3,13 @@
#include "../progs_cache.h"
-static bool LoadIBK(const char *fn, unsigned bank, const char *prefix, bool percussive, bool noRhythmMode = false)
+bool BankFormats::LoadIBK(BanksDump &db, const char *fn, unsigned bank,
+ const std::string &bankTitle, const char *prefix,
+ bool percussive, bool noRhythmMode)
{
- #ifdef HARD_BANKS
+#ifdef HARD_BANKS
writeIni("IBK", fn, prefix, bank, percussive ? INI_Drums : INI_Melodic);
- #endif
+#endif
FILE *fp = std::fopen(fn, "rb");
if(!fp)
return false;
@@ -21,6 +23,9 @@ static bool LoadIBK(const char *fn, unsigned bank, const char *prefix, bool perc
}
std::fclose(fp);
+ size_t bankDb = db.initBank(bank, bankTitle, BanksDump::BankEntry::SETUP_Generic);
+ BanksDump::MidiBank bnk;
+
unsigned offs1_base = 0x804, offs1_len = 9;
unsigned offs2_base = 0x004, offs2_len = 16;
@@ -43,7 +48,10 @@ static bool LoadIBK(const char *fn, unsigned bank, const char *prefix, bool perc
sprintf(name2, "%s%c%u", prefix,
(gmno < 128 ? 'M' : 'P'), gmno & 127);
- insdata tmp;
+ BanksDump::InstrumentEntry inst;
+ BanksDump::Operator ops[5];
+
+ InstBuffer tmp;
tmp.data[0] = data[offset2 + 0];
tmp.data[1] = data[offset2 + 1];
tmp.data[8] = data[offset2 + 2];
@@ -57,53 +65,43 @@ static bool LoadIBK(const char *fn, unsigned bank, const char *prefix, bool perc
tmp.data[10] = data[offset2 + 10];
// bisqwit: [+11] seems to be used also, what is it for?
// Wohlstand: You wanna know? It's the rhythm-mode drum number! If 0 - melodic, >0 - rhythm-mode drum
- tmp.finetune = percussive ? 0 : data[offset2 + 12];
- tmp.diff = false;
- struct ins tmp2;
- tmp2.notenum = percussive ? data[offset2 + 13] : 0;
- tmp2.pseudo4op = false;
- tmp2.real4op = false;
- tmp2.voice2_fine_tune = 0.0;
- tmp2.midi_velocity_offset = 0;
- tmp2.rhythmModeDrum = 0;
+ db.toOps(tmp.d, ops, 0);
+ inst.noteOffset1 = percussive ? 0 : data[offset2 + 12];
+ inst.percussionKeyNumber = percussive ? data[offset2 + 13] : 0;
+ inst.setFbConn(data[offset2 + 10]);
+
if(percussive && !noRhythmMode)
{
int rm = data[offset2 + 11];
switch(rm)
{
case 6:
- tmp2.rhythmModeDrum = ins::Flag_RM_BassDrum;
+ inst.instFlags |= BanksDump::InstrumentEntry::WOPL_RM_BassDrum;
break;
case 7:
- tmp2.rhythmModeDrum = ins::Flag_RM_Snare;
+ inst.instFlags |= BanksDump::InstrumentEntry::WOPL_RM_Snare;
break;
case 8:
- tmp2.rhythmModeDrum = ins::Flag_RM_TomTom;
+ inst.instFlags |= BanksDump::InstrumentEntry::WOPL_RM_TomTom;
break;
case 9:
- tmp2.rhythmModeDrum = ins::Flag_RM_Cymbal;
+ inst.instFlags |= BanksDump::InstrumentEntry::WOPL_RM_Cymbal;
break;
case 10:
- tmp2.rhythmModeDrum = ins::Flag_RM_HiHat;
+ inst.instFlags |= BanksDump::InstrumentEntry::WOPL_RM_HiHat;
break;
default:
// IBK logic: make non-percussion instrument be silent
- tmp = MakeNoSoundIns();
+// tmp = MakeNoSoundIns();
break;
}
}
- size_t resno = InsertIns(tmp, tmp2, std::string(1, '\377') + name, name2);
- SetBank(bank, (unsigned int)gmno, resno);
+ db.addInstrument(bnk, a, inst, ops, fn);
}
- AdlBankSetup setup;
- setup.volumeModel = VOLUME_Generic;
- setup.deepTremolo = false;
- setup.deepVibrato = false;
- setup.scaleModulators = false;
- SetBankSetup(bank, setup);
+ db.addMidiBank(bankDb, percussive, bnk);
return true;
}
diff --git a/utils/gen_adldata/file_formats/load_jv.h b/utils/gen_adldata/file_formats/load_jv.h
index a498bb6..9281114 100644
--- a/utils/gen_adldata/file_formats/load_jv.h
+++ b/utils/gen_adldata/file_formats/load_jv.h
@@ -4,11 +4,11 @@
#include "../progs_cache.h"
#include "../midi_inst_list.h"
-static bool LoadJunglevision(const char *fn, unsigned bank, const char *prefix)
+bool BankFormats::LoadJunglevision(BanksDump &db, const char *fn, unsigned bank, const std::string &bankTitle, const char *prefix)
{
- #ifdef HARD_BANKS
+#ifdef HARD_BANKS
writeIni("Junglevision", fn, prefix, bank, INI_Both);
- #endif
+#endif
FILE *fp = std::fopen(fn, "rb");
if(!fp)
return false;
@@ -22,6 +22,10 @@ static bool LoadJunglevision(const char *fn, unsigned bank, const char *prefix)
}
std::fclose(fp);
+ size_t bankDb = db.initBank(bank, bankTitle, BanksDump::BankEntry::SETUP_Win9X);
+ BanksDump::MidiBank bnkMelodique;
+ BanksDump::MidiBank bnkPercussion;
+
uint16_t ins_count = uint16_t(data[0x20] + (data[0x21] << 8));
uint16_t drum_count = uint16_t(data[0x22] + (data[0x23] << 8));
uint16_t first_ins = uint16_t(data[0x24] + (data[0x25] << 8));
@@ -38,7 +42,14 @@ static bool LoadJunglevision(const char *fn, unsigned bank, const char *prefix)
: gmno < 128 + 88 ? int(gmno - 35)
: -1;
- insdata tmp[2];
+ bool isPercussion = a >= ins_count;
+ size_t patchId = (a < ins_count) ? (a + first_ins) : ((a - ins_count) + first_drum);
+ BanksDump::MidiBank &bnk = isPercussion ? bnkPercussion : bnkMelodique;
+ BanksDump::InstrumentEntry inst;
+ BanksDump::Operator ops[5];
+ uint8_t notenum;
+
+ InstBuffer tmp[2];
tmp[0].data[0] = data[offset + 2];
tmp[0].data[1] = data[offset + 8];
@@ -51,8 +62,7 @@ static bool LoadJunglevision(const char *fn, unsigned bank, const char *prefix)
tmp[0].data[8] = data[offset + 3];
tmp[0].data[9] = data[offset + 9];
tmp[0].data[10] = data[offset + 7] & 0x0F;//~0x30;
- tmp[0].finetune = 0;
- tmp[0].diff = false;
+ inst.noteOffset1 = 0;
tmp[1].data[0] = data[offset + 2 + 11];
tmp[1].data[1] = data[offset + 8 + 11];
@@ -65,52 +75,39 @@ static bool LoadJunglevision(const char *fn, unsigned bank, const char *prefix)
tmp[1].data[8] = data[offset + 3 + 11];
tmp[1].data[9] = data[offset + 9 + 11];
tmp[1].data[10] = data[offset + 7 + 11] & 0x0F;//~0x30;
- tmp[1].finetune = 0;
- tmp[1].diff = (data[offset] != 0);
-
- struct ins tmp2;
- tmp2.notenum = data[offset + 1];
- tmp2.pseudo4op = false;
- tmp2.real4op = (data[offset] != 0);
- tmp2.voice2_fine_tune = 0.0;
- tmp2.midi_velocity_offset = 0;
- tmp2.rhythmModeDrum = 0;
-
- while(tmp2.notenum && tmp2.notenum < 20)
+ inst.noteOffset2 = 0;
+
+ notenum = data[offset + 1];
+
+ while(notenum && notenum < 20)
{
- tmp2.notenum += 12;
- tmp[0].finetune -= 12;
- tmp[1].finetune -= 12;
+ notenum += 12;
+ inst.noteOffset1 -= 12;
+ inst.noteOffset2 -= 12;
}
+ if(data[offset] != 0)
+ inst.instFlags |= BanksDump::InstrumentEntry::WOPL_Ins_4op;
+ inst.percussionKeyNumber = notenum;
+ inst.setFbConn(data[offset + 7], data[offset + 7 + 11]);
+ db.toOps(tmp[0].d, ops, 0);
+ db.toOps(tmp[1].d, ops, 2);
+
std::string name;
- if(midi_index >= 0) name = std::string(1, '\377') + MidiInsName[midi_index];
+ if(midi_index >= 0)
+ name = std::string(1, '\377') + MidiInsName[midi_index];
char name2[512];
sprintf(name2, "%s%c%u", prefix,
(gmno < 128 ? 'M' : 'P'), gmno & 127);
- if(!data[offset])
- {
- size_t resno = InsertIns(tmp[0], tmp2, name, name2);
- SetBank(bank, gmno, resno);
- }
- else // Double instrument
- {
- size_t resno = InsertIns(tmp[0], tmp[1], tmp2, name, name2);
- SetBank(bank, gmno, resno);
- }
+ db.addInstrument(bnk, patchId, inst, ops, fn);
}
- AdlBankSetup setup;
- setup.volumeModel = VOLUME_9X;
- setup.deepTremolo = true;
- setup.deepVibrato = true;
- setup.scaleModulators = false;
- SetBankSetup(bank, setup);
+ db.addMidiBank(bankDb, false, bnkMelodique);
+ db.addMidiBank(bankDb, true, bnkPercussion);
return true;
}
#endif // LOAD_JV_H
-
diff --git a/utils/gen_adldata/file_formats/load_op2.h b/utils/gen_adldata/file_formats/load_op2.h
index 86f1377..e43f17f 100644
--- a/utils/gen_adldata/file_formats/load_op2.h
+++ b/utils/gen_adldata/file_formats/load_op2.h
@@ -2,6 +2,9 @@
#define LOAD_OP2_H
#include "../progs_cache.h"
+#ifndef COMMON_H
+#include "common.h"
+#endif
#ifndef _MSC_VER
#define PACKED_STRUCT __attribute__((packed))
@@ -15,32 +18,32 @@
struct Doom_OPL2instrument
{
- unsigned char trem_vibr_1; /* OP 1: tremolo/vibrato/sustain/KSR/multi */
- unsigned char att_dec_1; /* OP 1: attack rate/decay rate */
- unsigned char sust_rel_1; /* OP 1: sustain level/release rate */
- unsigned char wave_1; /* OP 1: waveform select */
- unsigned char scale_1; /* OP 1: key scale level */
- unsigned char level_1; /* OP 1: output level */
- unsigned char feedback; /* feedback/AM-FM (both operators) */
- unsigned char trem_vibr_2; /* OP 2: tremolo/vibrato/sustain/KSR/multi */
- unsigned char att_dec_2; /* OP 2: attack rate/decay rate */
- unsigned char sust_rel_2; /* OP 2: sustain level/release rate */
- unsigned char wave_2; /* OP 2: waveform select */
- unsigned char scale_2; /* OP 2: key scale level */
- unsigned char level_2; /* OP 2: output level */
- unsigned char unused;
- short basenote; /* base note offset */
+ uint8_t trem_vibr_1; /* OP 1: tremolo/vibrato/sustain/KSR/multi */
+ uint8_t att_dec_1; /* OP 1: attack rate/decay rate */
+ uint8_t sust_rel_1; /* OP 1: sustain level/release rate */
+ uint8_t wave_1; /* OP 1: waveform select */
+ uint8_t scale_1; /* OP 1: key scale level */
+ uint8_t level_1; /* OP 1: output level */
+ uint8_t feedback; /* feedback/AM-FM (both operators) */
+ uint8_t trem_vibr_2; /* OP 2: tremolo/vibrato/sustain/KSR/multi */
+ uint8_t att_dec_2; /* OP 2: attack rate/decay rate */
+ uint8_t sust_rel_2; /* OP 2: sustain level/release rate */
+ uint8_t wave_2; /* OP 2: waveform select */
+ uint8_t scale_2; /* OP 2: key scale level */
+ uint8_t level_2; /* OP 2: output level */
+ uint8_t unused;
+ uint8_t basenote[2]; /* base note offset */
} PACKED_STRUCT;
struct Doom_opl_instr
{
- unsigned short flags;
+ uint8_t flags[2];
#define FL_FIXED_PITCH 0x0001 // note has fixed pitch (drum note)
-#define FL_UNKNOWN 0x0002 // ??? (used in instrument #65 only)
+#define FL_VIB_DELAY 0x0002 // vib_delay (used in instrument #65 only)
#define FL_DOUBLE_VOICE 0x0004 // use two voices instead of one
- unsigned char finetune;
- unsigned char note;
+ uint8_t finetune;
+ uint8_t note;
struct Doom_OPL2instrument patchdata[2];
} PACKED_STRUCT;
@@ -49,11 +52,11 @@ struct Doom_opl_instr
#endif
-static bool LoadDoom(const char *fn, unsigned bank, const char *prefix)
+bool BankFormats::LoadDoom(BanksDump &db, const char *fn, unsigned bank, const std::string &bankTitle, const char *prefix)
{
- #ifdef HARD_BANKS
+#ifdef HARD_BANKS
writeIni("OP2", fn, prefix, bank, INI_Both);
- #endif
+#endif
FILE *fp = std::fopen(fn, "rb");
if(!fp)
return false;
@@ -68,11 +71,17 @@ static bool LoadDoom(const char *fn, unsigned bank, const char *prefix)
}
std::fclose(fp);
+ size_t bankDb = db.initBank(bank, bankTitle, BanksDump::BankEntry::SETUP_DMX);
+ BanksDump::MidiBank bnkMelodique;
+ BanksDump::MidiBank bnkPercussion;
+
for(unsigned a = 0; a < 175; ++a)
{
const size_t offset1 = 0x18A4 + a * 32;
const size_t offset2 = 8 + a * 36;
-
+ BanksDump::MidiBank &bnk = a < 128 ? bnkMelodique : bnkPercussion;
+ BanksDump::InstrumentEntry inst;
+ BanksDump::Operator ops[5];
std::string name;
for(unsigned p = 0; p < 32; ++p)
if(data[offset1] != '\0')
@@ -80,15 +89,17 @@ static bool LoadDoom(const char *fn, unsigned bank, const char *prefix)
//printf("%3d %3d %3d %8s: ", a,b,c, name.c_str());
int gmno = int(a < 128 ? a : ((a | 128) + 35));
+ size_t patchId = a < 128 ? a : ((a - 128) + 35);
char name2[512];
snprintf(name2, 512, "%s%c%u", prefix, (gmno < 128 ? 'M' : 'P'), gmno & 127);
Doom_opl_instr &ins = *(Doom_opl_instr *) &data[offset2];
+ uint16_t flags = toSint16LE(ins.flags);
+
+ InstBuffer tmp[2] = {MakeNoSoundIns1(), MakeNoSoundIns1()};
+ int16_t noteOffset[2];
- insdata tmp[2] = {MakeNoSoundIns(), MakeNoSoundIns()};
- tmp[0].diff = false;
- tmp[1].diff = false;
for(size_t index = 0; index < 2; ++index)
{
const Doom_OPL2instrument &src = ins.patchdata[index];
@@ -103,38 +114,30 @@ static bool LoadDoom(const char *fn, unsigned bank, const char *prefix)
tmp[index].data[8] = src.scale_1 | src.level_1;
tmp[index].data[9] = src.scale_2 | src.level_2;
tmp[index].data[10] = src.feedback;
- tmp[index].finetune = int8_t(src.basenote + 12);
- }
- struct ins tmp2;
- tmp2.notenum = ins.note;
- tmp2.pseudo4op = false;
- tmp2.real4op = false;
- tmp2.voice2_fine_tune = 0.0;
- tmp2.midi_velocity_offset = 0;
- tmp2.rhythmModeDrum = 0;
-
- while(tmp2.notenum && tmp2.notenum < 20)
- {
- tmp2.notenum += 12;
- tmp[0].finetune -= 12;
- tmp[1].finetune -= 12;
+ noteOffset[index] = toSint16LE(src.basenote) + 12;
+ inst.fbConn |= (uint_fast16_t(src.feedback) << (index == 1 ? 8 : 0));
+ db.toOps(tmp[index].d, ops, index * 2);
}
- if(!(ins.flags & FL_DOUBLE_VOICE))
- {
- size_t resno = InsertIns(tmp[0], tmp2, std::string(1, '\377') + name, name2);
- SetBank(bank, (unsigned int)gmno, resno);
- }
- else // Double instrument
+ uint8_t notenum = ins.note;
+
+ while(notenum && notenum < 20)
{
- tmp2.pseudo4op = true;
- // Simulate behavior of DMX second voice detune
- tmp2.voice2_fine_tune = (double)((ins.finetune >> 1) - 64) / 32.0;
- //printf("/*DOOM FINE TUNE (flags %000X instrument is %d) IS %d -> %lf*/\n", ins.flags, a, ins.finetune, tmp2.fine_tune);
- size_t resno = InsertIns(tmp[0], tmp[1], tmp2, std::string(1, '\377') + name, name2);
- SetBank(bank, (unsigned int)gmno, resno);
+ notenum += 12;
+ noteOffset[0] -= 12;
+ noteOffset[1] -= 12;
}
+ inst.noteOffset1 = noteOffset[0];
+ inst.noteOffset2 = noteOffset[1];
+
+ if((flags & FL_DOUBLE_VOICE) != 0)
+ inst.instFlags |= BanksDump::InstrumentEntry::WOPL_Ins_4op | BanksDump::InstrumentEntry::WOPL_Ins_Pseudo4op;
+ inst.percussionKeyNumber = notenum;
+ inst.secondVoiceDetune = static_cast<char>(static_cast<int>(ins.finetune) - 128);
+
+ db.addInstrument(bnk, patchId, inst, ops, fn);
+
/*const Doom_OPL2instrument& A = ins.patchdata[0];
const Doom_OPL2instrument& B = ins.patchdata[1];
printf(
@@ -156,12 +159,8 @@ static bool LoadDoom(const char *fn, unsigned bank, const char *prefix)
printf("------------------------------------------------------------\n");*/
}
- AdlBankSetup setup;
- setup.volumeModel = VOLUME_DMX;
- setup.deepTremolo = false;
- setup.deepVibrato = false;
- setup.scaleModulators = false;
- SetBankSetup(bank, setup);
+ db.addMidiBank(bankDb, false, bnkMelodique);
+ db.addMidiBank(bankDb, true, bnkPercussion);
return true;
}
diff --git a/utils/gen_adldata/file_formats/load_tmb.h b/utils/gen_adldata/file_formats/load_tmb.h
index 4417b02..d6fa588 100644
--- a/utils/gen_adldata/file_formats/load_tmb.h
+++ b/utils/gen_adldata/file_formats/load_tmb.h
@@ -4,11 +4,11 @@
#include "../progs_cache.h"
#include "../midi_inst_list.h"
-static bool LoadTMB(const char *fn, unsigned bank, const char *prefix)
+bool BankFormats::LoadTMB(BanksDump &db, const char *fn, unsigned bank, const std::string &bankTitle, const char *prefix)
{
- #ifdef HARD_BANKS
+#ifdef HARD_BANKS
writeIni("TMB", fn, prefix, bank, INI_Both);
- #endif
+#endif
FILE *fp = std::fopen(fn, "rb");
if(!fp)
return false;
@@ -22,7 +22,11 @@ static bool LoadTMB(const char *fn, unsigned bank, const char *prefix)
}
std::fclose(fp);
- for(unsigned a = 0; a < 256; ++a)
+ size_t bankDb = db.initBank(bank, bankTitle, BanksDump::BankEntry::SETUP_Apogee);
+ BanksDump::MidiBank bnkMelodique;
+ BanksDump::MidiBank bnkPercussion;
+
+ for(unsigned a = 0, patchId = 0; a < 256; ++a, patchId++)
{
unsigned offset = a * 0x0D;
unsigned gmno = a;
@@ -30,8 +34,14 @@ static bool LoadTMB(const char *fn, unsigned bank, const char *prefix)
: gmno < 128 + 35 ? -1
: gmno < 128 + 88 ? int(gmno - 35)
: -1;
+ if(patchId == 128)
+ patchId = 0;
+ bool isPercussion = a >= 128;
+ BanksDump::MidiBank &bnk = isPercussion ? bnkPercussion : bnkMelodique;
+ BanksDump::InstrumentEntry inst;
+ BanksDump::Operator ops[5];
- insdata tmp;
+ InstBuffer tmp;
tmp.data[0] = data[offset + 0];
tmp.data[1] = data[offset + 1];
@@ -44,16 +54,11 @@ static bool LoadTMB(const char *fn, unsigned bank, const char *prefix)
tmp.data[8] = data[offset + 2];
tmp.data[9] = data[offset + 3];
tmp.data[10] = data[offset + 10];
- tmp.finetune = 0;
- tmp.diff = false;
- struct ins tmp2;
- tmp2.notenum = data[offset + 11];
- tmp2.pseudo4op = false;
- tmp2.real4op = false;
- tmp2.voice2_fine_tune = 0.0;
- tmp2.midi_velocity_offset = (int8_t)data[offset + 12];
- tmp2.rhythmModeDrum = 0;
+ inst.percussionKeyNumber = data[offset + 11];
+ inst.midiVelocityOffset = (int8_t)data[offset + 12];
+ inst.fbConn = data[offset + 10];
+ db.toOps(tmp.d, ops, 0);
std::string name;
if(midi_index >= 0) name = std::string(1, '\377') + MidiInsName[midi_index];
@@ -62,16 +67,11 @@ static bool LoadTMB(const char *fn, unsigned bank, const char *prefix)
sprintf(name2, "%s%c%u", prefix,
(gmno < 128 ? 'M' : 'P'), gmno & 127);
- size_t resno = InsertIns(tmp, tmp2, name, name2);
- SetBank(bank, gmno, resno);
+ db.addInstrument(bnk, patchId, inst, ops, fn);
}
- AdlBankSetup setup;
- setup.volumeModel = VOLUME_APOGEE;
- setup.deepTremolo = false;
- setup.deepVibrato = false;
- setup.scaleModulators = false;
- SetBankSetup(bank, setup);
+ db.addMidiBank(bankDb, false, bnkMelodique);
+ db.addMidiBank(bankDb, true, bnkPercussion);
return true;
}
diff --git a/utils/gen_adldata/file_formats/load_wopl.h b/utils/gen_adldata/file_formats/load_wopl.h
index d0c01d3..6705bd9 100644
--- a/utils/gen_adldata/file_formats/load_wopl.h
+++ b/utils/gen_adldata/file_formats/load_wopl.h
@@ -18,7 +18,7 @@ enum class WOPL_Flags
WOPL_RhythmModeMask = 0x38,
};
-static bool LoadWopl(const char *fn, unsigned bank, const char *prefix)
+bool BankFormats::LoadWopl(BanksDump &db, const char *fn, unsigned bank, const std::string bankTitle, const char *prefix)
{
FILE *fp = std::fopen(fn, "rb");
if(!fp)
@@ -27,6 +27,7 @@ static bool LoadWopl(const char *fn, unsigned bank, const char *prefix)
std::fflush(stderr);
return false;
}
+
std::fseek(fp, 0, SEEK_END);
std::vector<unsigned char> data(size_t(std::ftell(fp)));
std::rewind(fp);
@@ -57,11 +58,7 @@ static bool LoadWopl(const char *fn, unsigned bank, const char *prefix)
uint16_t mbanks_count = toUint16BE((const uint8_t *)data.data() + 0x0d);
uint16_t pbanks_count = toUint16BE((const uint8_t *)data.data() + 0x0f);
- AdlBankSetup setup;
- setup.deepTremolo = (data[0x11] & 0x01) != 0;
- setup.deepVibrato = (data[0x11] & 0x02) != 0;
- setup.volumeModel = (int)data[0x12];
- setup.scaleModulators = false;
+ size_t bankDb = db.initBank(bank, bankTitle, static_cast<uint_fast16_t>((static_cast<unsigned>(data[0x11]) << 8) | static_cast<unsigned>(data[0x12])));
// Validate file format by size calculation
if(version == 1)
@@ -91,27 +88,50 @@ static bool LoadWopl(const char *fn, unsigned bank, const char *prefix)
uint32_t melodic_offset = 0;
uint32_t percussion_offset = 0;
+ uint32_t melodic_meta_offset = 0;
+ uint32_t percussion_meta_offset = 0;
+
if(version < 2)
+ {
melodic_offset = 0x13;
+ melodic_meta_offset = 0;
+ }
else
+ {
melodic_offset = 0x13 + 34 * mbanks_count + 34 * pbanks_count;
+ melodic_meta_offset = 0x13;
+ percussion_meta_offset = 0x13 + 34 * mbanks_count;
+ }
percussion_offset = melodic_offset + (insSize * 128 * mbanks_count);
- uint32_t root_offsets[2] = {melodic_offset, percussion_offset};
+ uint32_t root_sizes[2] = {mbanks_count, pbanks_count};
+ uint32_t root_offsets[2] = {melodic_offset, percussion_offset};
+ uint32_t root_meta_offsets[2] = {melodic_meta_offset, percussion_meta_offset};
for(size_t bset = 0; bset < 2; bset++)
{
bool is_percussion = (bset == 1);
- for(uint32_t bankno = 0; bankno < 1; bankno++) // only first melodic bank (Until multi-banks support will be implemented)
+ for(uint32_t bankno = 0; bankno < root_sizes[bset]; bankno++) // only first melodic bank (Until multi-banks support will be implemented)
{
uint32_t bank_offset = root_offsets[bset] + (bankno * insSize * 128);
+ BanksDump::MidiBank bnk;
+ if(version >= 2)
+ {
+ uint32_t meta_offset = root_meta_offsets[bset] + (bankno * 34);
+ bnk.lsb = data[meta_offset + 32 + 0];
+ bnk.msb = data[meta_offset + 32 + 1];
+ }
+
for(uint32_t i = 0; i < 128; i++)
{
uint32_t offset = bank_offset + uint32_t(i * insSize);
std::string name;
- insdata tmp[2];
+ InstBuffer tmp[2];
+
+ BanksDump::InstrumentEntry inst;
+ BanksDump::Operator ops[5];
name.resize(32);
std::memcpy(&name[0], data.data() + offset, 32);
@@ -131,57 +151,55 @@ static bool LoadWopl(const char *fn, unsigned bank, const char *prefix)
8 Systain and Release register data
9 Wave form
*/
- tmp[0].data[0] = data[offset + 42 + 5];//AMVIB op1
- tmp[0].data[1] = data[offset + 42 + 0];//AMVIB op2
- tmp[0].data[2] = data[offset + 42 + 7];//AtDec op1
- tmp[0].data[3] = data[offset + 42 + 2];//AtDec op2
- tmp[0].data[4] = data[offset + 42 + 8];//SusRel op1
- tmp[0].data[5] = data[offset + 42 + 3];//SusRel op2
- tmp[0].data[6] = data[offset + 42 + 9];//Wave op1
- tmp[0].data[7] = data[offset + 42 + 4];//Wave op2
- tmp[0].data[8] = data[offset + 42 + 6];//KSL op1
- tmp[0].data[9] = data[offset + 42 + 1];//KSL op2
- tmp[0].data[10] = data[offset + 40]; //FeedBack/Connection
-
- tmp[1].data[0] = data[offset + 52 + 5];
- tmp[1].data[1] = data[offset + 52 + 0];
- tmp[1].data[2] = data[offset + 52 + 7];
- tmp[1].data[3] = data[offset + 52 + 2];
- tmp[1].data[4] = data[offset + 52 + 8];
- tmp[1].data[5] = data[offset + 52 + 3];
- tmp[1].data[6] = data[offset + 52 + 9];
- tmp[1].data[7] = data[offset + 52 + 4];
- tmp[1].data[8] = data[offset + 52 + 6];
- tmp[1].data[9] = data[offset + 52 + 1];
- tmp[1].data[10] = data[offset + 41];
+ tmp[0].d.op1_amvib = data[offset + 42 + 5];//AMVIB op1
+ tmp[0].d.op2_amvib = data[offset + 42 + 0];//AMVIB op2
+ tmp[0].d.op1_atdec = data[offset + 42 + 7];//AtDec op1
+ tmp[0].d.op2_atdec = data[offset + 42 + 2];//AtDec op2
+ tmp[0].d.op1_susrel = data[offset + 42 + 8];//SusRel op1
+ tmp[0].d.op2_susrel = data[offset + 42 + 3];//SusRel op2
+ tmp[0].d.op1_wave = data[offset + 42 + 9];//Wave op1
+ tmp[0].d.op2_wave = data[offset + 42 + 4];//Wave op2
+ tmp[0].d.op1_ksltl = data[offset + 42 + 6];//KSL op1
+ tmp[0].d.op2_ksltl = data[offset + 42 + 1];//KSL op2
+ tmp[0].d.fbconn = data[offset + 40]; //FeedBack/Connection
+
+ tmp[1].d.op1_amvib = data[offset + 52 + 5];
+ tmp[1].d.op2_amvib = data[offset + 52 + 0];
+ tmp[1].d.op1_atdec = data[offset + 52 + 7];
+ tmp[1].d.op2_atdec = data[offset + 52 + 2];
+ tmp[1].d.op1_susrel = data[offset + 52 + 8];
+ tmp[1].d.op2_susrel = data[offset + 52 + 3];
+ tmp[1].d.op1_wave = data[offset + 52 + 9];
+ tmp[1].d.op2_wave = data[offset + 52 + 4];
+ tmp[1].d.op1_ksltl = data[offset + 52 + 6];
+ tmp[1].d.op2_ksltl = data[offset + 52 + 1];
+ tmp[1].d.fbconn = data[offset + 41];
/*
* We will don't read two millisecond delays on tail of instrument
* as there are will be re-calculated by measurer here.
* Those fields are made for hot-loading while runtime, but not
* for generation of embedded banks database.
*/
+ db.toOps(tmp[0].d, ops, 0);
+ db.toOps(tmp[1].d, ops, 2);
- tmp[0].finetune = int8_t(toSint16BE((const uint8_t *)data.data() + offset + 32));
- tmp[1].finetune = int8_t(toSint16BE((const uint8_t *)data.data() + offset + 34));
uint8_t flags = data[offset + 39];
- struct ins tmp2;
- tmp2.notenum = is_percussion ? data[offset + 38] : 0;
- bool real4op = (flags & (uint8_t)WOPL_Flags::Mode_4op) != 0;
- 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];
- tmp2.rhythmModeDrum = (flags & (uint8_t)WOPL_Flags::WOPL_RhythmModeMask);
- tmp[0].diff = false;
- tmp[1].diff = real4op && !tmp2.pseudo4op;
-
- int8_t fine_tune = (int8_t)data[offset + 37];
- if(fine_tune != 0)
+ //----------------
+ inst.instFlags = flags;
+ inst.percussionKeyNumber = is_percussion ? data[offset + 38] : 0;
+ inst.noteOffset1 = int8_t(toSint16BE((const uint8_t *)data.data() + offset + 32));
+ inst.noteOffset2 = int8_t(toSint16BE((const uint8_t *)data.data() + offset + 34));
+ inst.secondVoiceDetune = static_cast<int_fast8_t>(data[offset + 37]);
+ inst.midiVelocityOffset = static_cast<int_fast8_t>(data[offset + 36]);
+ inst.fbConn = (static_cast<uint_fast16_t>(data[offset + 40])) |
+ (static_cast<uint_fast16_t>(data[offset + 41]) << 8);
+ if(version >= 2)
{
- // Simulate behavior of DMX second voice detune
- tmp2.voice2_fine_tune = (double)((((int)fine_tune + 128) >> 1) - 64) / 32.0;
+ inst.delay_on_ms = toUint16BE((const uint8_t *)data.data() + offset + 62);
+ inst.delay_off_ms = toUint16BE((const uint8_t *)data.data() + offset + 64);
}
+ //----------------
uint32_t gmno = is_percussion ? i + 128 : i;
@@ -210,22 +228,12 @@ static bool LoadWopl(const char *fn, unsigned bank, const char *prefix)
else
snprintf(name2, 512, "%sM%u", prefix, i);
- if(!real4op && !tmp2.pseudo4op)
- {
- size_t resno = InsertIns(tmp[0], tmp2, name, name2);
- SetBank(bank, gmno, resno);
- }
- else
- {
- size_t resno = InsertIns(tmp[0], tmp[1], tmp2, name, name2);
- SetBank(bank, gmno, resno);
- }
+ db.addInstrument(bnk, i, inst, ops, fn);
}
+ db.addMidiBank(bankDb, is_percussion, bnk);
}
}
- SetBankSetup(bank, setup);
-
return true;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 07:00:16 +0000