diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/gen_adldata/file_formats/load_bnk.h | 2 | ||||
| -rw-r--r-- | utils/gen_adldata/progs_cache.h | 10 | ||||
| -rw-r--r-- | utils/midiplay/adlmidiplay.cpp | 10 |
3 files changed, 14 insertions, 8 deletions
diff --git a/utils/gen_adldata/file_formats/load_bnk.h b/utils/gen_adldata/file_formats/load_bnk.h index 29f5494..0aa41ac 100644 --- a/utils/gen_adldata/file_formats/load_bnk.h +++ b/utils/gen_adldata/file_formats/load_bnk.h @@ -27,7 +27,7 @@ bool BankFormats::LoadBNK(BanksDump &db, const char *fn, unsigned bank, } std::fclose(fp); - size_t bankDb = db.initBank(bank, bankTitle, BanksDump::BankEntry::SETUP_Generic); + size_t bankDb = db.initBank(bank, bankTitle, BanksDump::BankEntry::SETUP_HMI); BanksDump::MidiBank bnk; /*printf("%s:\n", fn);*/ diff --git a/utils/gen_adldata/progs_cache.h b/utils/gen_adldata/progs_cache.h index c2ade65..668c253 100644 --- a/utils/gen_adldata/progs_cache.h +++ b/utils/gen_adldata/progs_cache.h @@ -113,7 +113,9 @@ struct BanksDump WOPL_VM_Win9x, WOPL_VM_DMX_Fixed, WOPL_VM_Apogee_Fixed, - WOPL_VM_AIL + WOPL_VM_AIL, + WOPL_VM_Win9x_GeneralFM, + WOPL_VM_HMI } WOPL_VolumeModel; /** @@ -122,13 +124,15 @@ struct BanksDump enum BankSetup { SETUP_Generic = 0x0300, - SETUP_Win9X = 0x0304, + SETUP_Win9X = 0x0304, // SB16 + SETUP_Win9XGF = 0x0308, // GeneralFM SETUP_DMX = 0x0002, SETUP_Apogee = 0x0003, SETUP_AIL = 0x0307, SETUP_IBK = 0x0301, SETUP_IMF = 0x0200, - SETUP_CMF = 0x0201 + SETUP_CMF = 0x0201, + SETUP_HMI = 0x0309 }; uint_fast16_t bankSetup = SETUP_Generic; // 0xAABB, AA - OPL flags, BB - Volume model diff --git a/utils/midiplay/adlmidiplay.cpp b/utils/midiplay/adlmidiplay.cpp index c4738e1..fe54877 100644 --- a/utils/midiplay/adlmidiplay.cpp +++ b/utils/midiplay/adlmidiplay.cpp @@ -213,17 +213,19 @@ const char* volume_model_to_str(int vm) case ADLMIDI_VolumeModel_DMX: return "DMX"; case ADLMIDI_VolumeModel_APOGEE: - return "Apogee"; + return "Apogee Sound System"; case ADLMIDI_VolumeModel_9X: return "9X (SB16)"; case ADLMIDI_VolumeModel_DMX_Fixed: - return "DMX (fixed)"; + return "DMX (fixed AM voices)"; case ADLMIDI_VolumeModel_APOGEE_Fixed: - return "Apogee (fixed)"; + return "Apogee Sound System (fixed AM voices)"; case ADLMIDI_VolumeModel_AIL: - return "AIL"; + return "Audio Interfaces Library (AIL)"; case ADLMIDI_VolumeModel_9X_GENERIC_FM: return "9X (Generic FM)"; + case ADLMIDI_VolumeModel_HMI: + return "HMI"; } } |