diff options
| -rw-r--r-- | utils/gen_adldata/file_formats/load_wopl.h | 49 | ||||
| -rw-r--r-- | utils/gen_adldata/gen_adldata.cc | 2 | ||||
| -rw-r--r-- | utils/gen_adldata/progs_cache.cpp | 83 | ||||
| -rw-r--r-- | utils/gen_adldata/progs_cache.h | 15 |
4 files changed, 123 insertions, 26 deletions
diff --git a/utils/gen_adldata/file_formats/load_wopl.h b/utils/gen_adldata/file_formats/load_wopl.h index cef475f..6c57950 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(BanksDump &db, const char *fn, unsigned bank, const char *prefix) +static bool LoadWopl(BanksDump &db, const char *fn, unsigned bank, const std::string bankTitle, const char *prefix) { FILE *fp = std::fopen(fn, "rb"); if(!fp) @@ -64,7 +64,7 @@ static bool LoadWopl(BanksDump &db, const char *fn, unsigned bank, const char *p setup.volumeModel = (int)data[0x12]; setup.scaleModulators = false; - size_t bankDb = (unsigned)db.initBank(bank, static_cast<uint_fast16_t>((static_cast<unsigned>(data[0x11]) << 8) | static_cast<unsigned>(data[0x12]))); + size_t bankDb = (unsigned)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) @@ -94,16 +94,28 @@ static bool LoadWopl(BanksDump &db, const char *fn, unsigned bank, const char *p 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_sizes[2] = {mbanks_count, pbanks_count}; - uint32_t root_sizes[2] = {1, 1}; + uint32_t root_sizes[2] = {(version >= 2) ? mbanks_count : 1u, + (version >= 2) ? pbanks_count : 1u}; 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++) { @@ -112,12 +124,23 @@ static bool LoadWopl(BanksDump &db, const char *fn, unsigned bank, const char *p { 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]; + BanksDump::InstrumentEntry inst; + BanksDump::Operator ops[5]; + name.resize(32); std::memcpy(&name[0], data.data() + offset, 32); name.resize(std::strlen(&name[0])); @@ -165,6 +188,9 @@ static bool LoadWopl(BanksDump &db, const char *fn, unsigned bank, const char *p * Those fields are made for hot-loading while runtime, but not * for generation of embedded banks database. */ + db.toOps(tmp[0], ops, 0); + db.toOps(tmp[1], 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)); @@ -180,6 +206,21 @@ static bool LoadWopl(BanksDump &db, const char *fn, unsigned bank, const char *p tmp2.rhythmModeDrum = (flags & (uint8_t)WOPL_Flags::WOPL_RhythmModeMask); tmp[0].diff = false; tmp[1].diff = real4op && !tmp2.pseudo4op; + //---------------- + 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 + 32)); + 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) + { + inst.delay_on_ms = toUint16BE((const uint8_t *)data.data() + offset + 62); + inst.delay_off_ms = toUint16BE((const uint8_t *)data.data() + offset + 64); + } + //---------------- int8_t fine_tune = (int8_t)data[offset + 37]; if(fine_tune != 0) @@ -229,7 +270,9 @@ static bool LoadWopl(BanksDump &db, const char *fn, unsigned bank, const char *p size_t resno = InsertIns(tmp[0], tmp[1], tmp2, name, name2); SetBank(bank, gmno, resno); } + db.addInstrument(bnk, i, inst, ops); } + db.addMidiBank(bankDb, is_percussion, bnk); } } diff --git a/utils/gen_adldata/gen_adldata.cc b/utils/gen_adldata/gen_adldata.cc index 1896c43..341a3f9 100644 --- a/utils/gen_adldata/gen_adldata.cc +++ b/utils/gen_adldata/gen_adldata.cc @@ -132,7 +132,7 @@ int main(int argc, char**argv) else if(format == "WOPL") { - if(!LoadWopl(db, filepath.c_str(), bank, prefix.c_str())) + if(!LoadWopl(db, filepath.c_str(), bank, bank_name, prefix.c_str())) { std::fprintf(stderr, "Failed to load bank %u, file %s!\n", bank, filepath.c_str()); return 1; diff --git a/utils/gen_adldata/progs_cache.cpp b/utils/gen_adldata/progs_cache.cpp index df78026..978494c 100644 --- a/utils/gen_adldata/progs_cache.cpp +++ b/utils/gen_adldata/progs_cache.cpp @@ -123,7 +123,23 @@ insdata MakeNoSoundIns() } -size_t BanksDump::initBank(size_t bankId, uint_fast16_t bankSetup) +void BanksDump::toOps(const insdata &inData, BanksDump::Operator *outData, size_t begin) +{ + outData[begin + 0].d_E862 = + uint_fast32_t(inData.data[6] << 24) + + uint_fast32_t(inData.data[4] << 16) + + uint_fast32_t(inData.data[2] << 8) + + uint_fast32_t(inData.data[0] << 0); + outData[begin + 1].d_E862 = + uint_fast32_t(inData.data[7] << 24) + + uint_fast32_t(inData.data[5] << 16) + + uint_fast32_t(inData.data[3] << 8) + + uint_fast32_t(inData.data[1] << 0); + outData[begin + 0].d_40 = inData.data[8]; + outData[begin + 1].d_40 = inData.data[9]; +} + +size_t BanksDump::initBank(size_t bankId, const std::string &title, uint_fast16_t bankSetup) { #if 0 assert(bankId <= banks.size()); @@ -131,10 +147,12 @@ size_t BanksDump::initBank(size_t bankId, uint_fast16_t bankSetup) banks.emplace_back(); BankEntry &b = banks[bankId]; #else + bankId = banks.size(); banks.emplace_back(); BankEntry &b = banks.back(); #endif b.bankId = bankId; + b.bankTitle = title; b.bankSetup = bankSetup; return b.bankId; } @@ -167,6 +185,13 @@ void BanksDump::addInstrument(BanksDump::MidiBank &bank, size_t patchId, BanksDu size_t opsCount = ((e.instFlags & InstrumentEntry::WOPL_Ins_4op) != 0 || (e.instFlags & InstrumentEntry::WOPL_Ins_Pseudo4op) != 0) ? 4 : 2; + + if((e.instFlags & InstrumentEntry::WOPL_Ins_IsBlank) != 0) + { + bank.instruments[patchId] = -1; + return; + } + for(size_t op = 0; op < opsCount; op++) { Operator o = ops[op]; @@ -213,22 +238,38 @@ void BanksDump::exportBanks(const std::string &outPath, const std::string &heade "{\n"); for(const BankEntry &be : banks) { + bool commaNeeded = true; std::fprintf(out, " {\n"); - std::fprintf(out, " 0x%04lX, %zu, %zu,", + std::fprintf(out, " 0x%04lX, %zu, %zu, \"%s\",\n", be.bankSetup, be.melodic.size(), - be.percussion.size()); + be.percussion.size(), + be.bankTitle.c_str()); // Melodic banks - std::fprintf(out, " { "); + std::fprintf(out, " {"); + commaNeeded = false; for(const size_t &me : be.melodic) - std::fprintf(out, "%zu, ", me); - std::fprintf(out, " },\n"); + { + if(commaNeeded) + std::fprintf(out, ", "); + else + commaNeeded = true; + std::fprintf(out, "%zu", me); + } + std::fprintf(out, "},\n"); // Percussive banks - std::fprintf(out, " { "); + commaNeeded = false; + std::fprintf(out, " {"); for(const size_t &me : be.percussion) - std::fprintf(out, "%zu, ", me); - std::fprintf(out, " }\n"); + { + if(commaNeeded) + std::fprintf(out, ", "); + else + commaNeeded = true; + std::fprintf(out, "%zu", me); + } + std::fprintf(out, "}\n"); std::fprintf(out, " },\n"); } @@ -240,13 +281,21 @@ void BanksDump::exportBanks(const std::string &outPath, const std::string &heade "{\n"); for(const MidiBank &be : midiBanks) { + bool commaNeeded = true; std::fprintf(out, " {\n"); - std::fprintf(out, " %u, %u,", be.msb, be.lsb); + std::fprintf(out, " %u, %u,\n", be.msb, be.lsb); - std::fprintf(out, " { "); + std::fprintf(out, " {"); + commaNeeded = false; for(size_t i = 0; i < 128; i++) - std::fprintf(out, "%ld, ", be.instruments[i]); - std::fprintf(out, " },\n"); + { + if(commaNeeded) + std::fprintf(out, ", "); + else + commaNeeded = true; + std::fprintf(out, "%ld", be.instruments[i]); + } + std::fprintf(out, "},\n"); std::fprintf(out, " },\n"); } @@ -260,7 +309,7 @@ void BanksDump::exportBanks(const std::string &outPath, const std::string &heade size_t opsCount = ((be.instFlags & InstrumentEntry::WOPL_Ins_4op) != 0 || (be.instFlags & InstrumentEntry::WOPL_Ins_Pseudo4op) != 0) ? 4 : 2; std::fprintf(out, " {\n"); - std::fprintf(out, " %u, %u, %d, %u, %lu, %d, %lu, %lu, %lu, ", + std::fprintf(out, " %u, %u, %d, %u, %lu, %d, 0x%04lX, 0x%lX, 0x%lX,\n", be.noteOffset1, be.noteOffset2, be.midiVelocityOffset, @@ -272,10 +321,10 @@ void BanksDump::exportBanks(const std::string &outPath, const std::string &heade be.delay_off_ms); if(opsCount == 4) - std::fprintf(out, "{%ld, %ld, %ld, %ld}", + std::fprintf(out, " {%ld, %ld, %ld, %ld}\n", be.ops[0], be.ops[1], be.ops[2], be.ops[3]); else - std::fprintf(out, "{%ld, %ld}", + std::fprintf(out, " {%ld, %ld}\n", be.ops[0], be.ops[1]); std::fprintf(out, " },\n"); @@ -286,7 +335,7 @@ void BanksDump::exportBanks(const std::string &outPath, const std::string &heade "{\n"); for(const Operator &be : operators) { - std::fprintf(out, " { %08lX, %02lX },\n", + std::fprintf(out, " {0x%07lX, 0x%02lX},\n", be.d_E862, be.d_40); } diff --git a/utils/gen_adldata/progs_cache.h b/utils/gen_adldata/progs_cache.h index d115ddc..89d611f 100644 --- a/utils/gen_adldata/progs_cache.h +++ b/utils/gen_adldata/progs_cache.h @@ -135,6 +135,7 @@ struct BanksDump struct BankEntry { uint_fast32_t bankId = 0; + std::string bankTitle = "Untitled"; /* Global OPL flags */ typedef enum WOPLFileFlags @@ -179,6 +180,7 @@ struct BanksDump BankEntry(const BankEntry &o) { bankId = o.bankId; + bankTitle = o.bankTitle; bankSetup = o.bankSetup; melodic = o.melodic; percussion = o.percussion; @@ -187,6 +189,7 @@ struct BanksDump BankEntry(const BankEntry &&o) { bankId = std::move(o.bankId); + bankTitle = std::move(o.bankTitle); bankSetup = std::move(o.bankSetup); melodic = std::move(o.melodic); percussion = std::move(o.percussion); @@ -207,9 +210,9 @@ struct BanksDump MidiBank(const MidiBank &o) { - midiBankId = 0; - msb = 0; - lsb = 0; + midiBankId = o.midiBankId; + msb = o.msb; + lsb = o.lsb; std::memcpy(instruments, o.instruments, sizeof(int_fast32_t) * 128); } @@ -277,7 +280,7 @@ struct BanksDump 4op: modulator1, carrier1, modulator2, carrier2, feedback1 */ //! Contains FeedBack-Connection for both operators 0xBBAA - AA - first, BB - second - int_fast16_t fbConn = 0; + uint_fast16_t fbConn = 0; int_fast64_t delay_on_ms = 0; int_fast64_t delay_off_ms = 0; int_fast32_t ops[5] = {-1, -1, -1, -1, -1}; @@ -323,7 +326,9 @@ struct BanksDump std::vector<InstrumentEntry> instruments; std::vector<Operator> operators; - size_t initBank(size_t bankId, uint_fast16_t bankSetup); + void toOps(const insdata &inData, Operator *outData, size_t begin = 0); + + size_t initBank(size_t bankId, const std::string &title, uint_fast16_t bankSetup); void addMidiBank(size_t bankId, bool percussion, MidiBank b); void addInstrument(MidiBank &bank, size_t patchId, InstrumentEntry e, Operator *ops); void exportBanks(const std::string &outPath, const std::string &headerName = "adlmidi_db.h"); |