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/load_ail.h2
-rw-r--r--utils/gen_adldata/file_formats/load_bisqwit.h2
-rw-r--r--utils/gen_adldata/file_formats/load_bnk.h2
-rw-r--r--utils/gen_adldata/file_formats/load_bnk2.h4
-rw-r--r--utils/gen_adldata/file_formats/load_ea.h10
-rw-r--r--utils/gen_adldata/file_formats/load_ibk.h2
-rw-r--r--utils/gen_adldata/file_formats/load_jv.h2
-rw-r--r--utils/gen_adldata/file_formats/load_op2.h2
-rw-r--r--utils/gen_adldata/file_formats/load_tmb.h2
-rw-r--r--utils/gen_adldata/file_formats/load_wopl.h2
10 files changed, 15 insertions, 15 deletions
diff --git a/utils/gen_adldata/file_formats/load_ail.h b/utils/gen_adldata/file_formats/load_ail.h
index 286b665..a12789b 100644
--- a/utils/gen_adldata/file_formats/load_ail.h
+++ b/utils/gen_adldata/file_formats/load_ail.h
@@ -169,7 +169,7 @@ bool BankFormats::LoadMiles(BanksDump &db, const char *fn, unsigned bank,
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);
+ db.addInstrument(bnk, h.patch, inst, ops, fn);
}
}
diff --git a/utils/gen_adldata/file_formats/load_bisqwit.h b/utils/gen_adldata/file_formats/load_bisqwit.h
index 8ff91b1..7ea3a38 100644
--- a/utils/gen_adldata/file_formats/load_bisqwit.h
+++ b/utils/gen_adldata/file_formats/load_bisqwit.h
@@ -71,7 +71,7 @@ bool BankFormats::LoadBisqwit(BanksDump &db, const char *fn, unsigned bank, cons
inst.fbConn = uint_fast16_t(tmp[0].data[10]) | (uint_fast16_t(tmp[1].data[10]) << 8);
inst.percussionKeyNumber = a >= 128 ? tmp2.notenum : 0;
inst.noteOffset1 = a < 128 ? tmp2.notenum : 0;
- db.addInstrument(bnk, patchId, inst, ops);
+ db.addInstrument(bnk, patchId, inst, ops, fn);
}
std::fclose(fp);
diff --git a/utils/gen_adldata/file_formats/load_bnk.h b/utils/gen_adldata/file_formats/load_bnk.h
index beb2bd5..9379de5 100644
--- a/utils/gen_adldata/file_formats/load_bnk.h
+++ b/utils/gen_adldata/file_formats/load_bnk.h
@@ -132,7 +132,7 @@ bool BankFormats::LoadBNK(BanksDump &db, const char *fn, unsigned bank,
if(!is_fat)
{
SetBank(bank, (unsigned int)gmno, resno);
- db.addInstrument(bnk, n & 127, inst, ops);
+ db.addInstrument(bnk, n & 127, inst, ops, fn);
}
else
{
diff --git a/utils/gen_adldata/file_formats/load_bnk2.h b/utils/gen_adldata/file_formats/load_bnk2.h
index e977cd7..5468cb5 100644
--- a/utils/gen_adldata/file_formats/load_bnk2.h
+++ b/utils/gen_adldata/file_formats/load_bnk2.h
@@ -124,7 +124,7 @@ bool BankFormats::LoadBNK2(BanksDump &db, const char *fn, unsigned bank,
SetBank(bank, (unsigned int)gmno, resno);
inst.instFlags |= BanksDump::InstrumentEntry::WOPL_Ins_4op;
- db.addInstrument(bnk, patchId, inst, opsD);
+ db.addInstrument(bnk, patchId, inst, opsD, fn);
}
else
{
@@ -132,7 +132,7 @@ bool BankFormats::LoadBNK2(BanksDump &db, const char *fn, unsigned bank,
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);
+ db.addInstrument(bnk, patchId, inst, opsD, fn);
}
}
diff --git a/utils/gen_adldata/file_formats/load_ea.h b/utils/gen_adldata/file_formats/load_ea.h
index 7d15883..4b40b0f 100644
--- a/utils/gen_adldata/file_formats/load_ea.h
+++ b/utils/gen_adldata/file_formats/load_ea.h
@@ -113,14 +113,14 @@ bool BankFormats::LoadEA(BanksDump &db, const char *fn, unsigned bank,
size_t resno = InsertIns(tmp, tmp2, std::string(1, '\377') + name, name2);
SetBank(bank, gmno, resno);
- db.addInstrument(bnkMelodic, gmno, inst, ops);
+ 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);
+ db.addInstrument(bnkPercussion, 0x36, inst, ops, fn);
}
if(gmno == 18)
@@ -128,7 +128,7 @@ bool BankFormats::LoadEA(BanksDump &db, const char *fn, unsigned bank,
/*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);
+ db.addInstrument(bnkPercussion, 0x2A, inst, ops, fn);
}
if(gmno == 16)
@@ -136,7 +136,7 @@ bool BankFormats::LoadEA(BanksDump &db, const char *fn, unsigned bank,
/*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);
+ db.addInstrument(bnkPercussion, 0x24, inst, ops, fn);
}
if(gmno == 17)
@@ -144,7 +144,7 @@ bool BankFormats::LoadEA(BanksDump &db, const char *fn, unsigned bank,
/*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);
+ db.addInstrument(bnkPercussion, 0x26, inst, ops, fn);
}
}
diff --git a/utils/gen_adldata/file_formats/load_ibk.h b/utils/gen_adldata/file_formats/load_ibk.h
index 029d193..d4b54f6 100644
--- a/utils/gen_adldata/file_formats/load_ibk.h
+++ b/utils/gen_adldata/file_formats/load_ibk.h
@@ -115,7 +115,7 @@ bool BankFormats::LoadIBK(BanksDump &db, const char *fn, unsigned bank,
size_t resno = InsertIns(tmp, tmp2, std::string(1, '\377') + name, name2);
SetBank(bank, (unsigned int)gmno, resno);
- db.addInstrument(bnk, a, inst, ops);
+ db.addInstrument(bnk, a, inst, ops, fn);
}
db.addMidiBank(bankDb, percussive, bnk);
diff --git a/utils/gen_adldata/file_formats/load_jv.h b/utils/gen_adldata/file_formats/load_jv.h
index ef36f76..bb4fbdb 100644
--- a/utils/gen_adldata/file_formats/load_jv.h
+++ b/utils/gen_adldata/file_formats/load_jv.h
@@ -117,7 +117,7 @@ bool BankFormats::LoadJunglevision(BanksDump &db, const char *fn, unsigned bank,
size_t resno = InsertIns(tmp[0], tmp[1], tmp2, name, name2);
SetBank(bank, gmno, resno);
}
- db.addInstrument(bnk, patchId, inst, ops);
+ db.addInstrument(bnk, patchId, inst, ops, fn);
}
db.addMidiBank(bankDb, false, bnkMelodique);
diff --git a/utils/gen_adldata/file_formats/load_op2.h b/utils/gen_adldata/file_formats/load_op2.h
index 6599a9f..e31a803 100644
--- a/utils/gen_adldata/file_formats/load_op2.h
+++ b/utils/gen_adldata/file_formats/load_op2.h
@@ -155,7 +155,7 @@ bool BankFormats::LoadDoom(BanksDump &db, const char *fn, unsigned bank, const s
SetBank(bank, (unsigned int)gmno, resno);
}
- db.addInstrument(bnk, patchId, inst, ops);
+ db.addInstrument(bnk, patchId, inst, ops, fn);
/*const Doom_OPL2instrument& A = ins.patchdata[0];
const Doom_OPL2instrument& B = ins.patchdata[1];
diff --git a/utils/gen_adldata/file_formats/load_tmb.h b/utils/gen_adldata/file_formats/load_tmb.h
index 66ced30..d9d57dd 100644
--- a/utils/gen_adldata/file_formats/load_tmb.h
+++ b/utils/gen_adldata/file_formats/load_tmb.h
@@ -80,7 +80,7 @@ bool BankFormats::LoadTMB(BanksDump &db, const char *fn, unsigned bank, const st
size_t resno = InsertIns(tmp, tmp2, name, name2);
SetBank(bank, gmno, resno);
- db.addInstrument(bnk, patchId, inst, ops);
+ db.addInstrument(bnk, patchId, inst, ops, fn);
}
db.addMidiBank(bankDb, false, bnkMelodique);
diff --git a/utils/gen_adldata/file_formats/load_wopl.h b/utils/gen_adldata/file_formats/load_wopl.h
index 0db911c..047ed7b 100644
--- a/utils/gen_adldata/file_formats/load_wopl.h
+++ b/utils/gen_adldata/file_formats/load_wopl.h
@@ -271,7 +271,7 @@ bool BankFormats::LoadWopl(BanksDump &db, const char *fn, unsigned bank, const s
SetBank(bank, gmno, resno);
}
}
- db.addInstrument(bnk, i, inst, ops);
+ db.addInstrument(bnk, i, inst, ops, fn);
}
db.addMidiBank(bankDb, is_percussion, bnk);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-03 16:49:34 +0000