diff options
| author | Wohlstand <admin@wohlnet.ru> | 2020-09-02 22:49:14 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2020-09-02 22:49:14 +0300 |
| commit | 9d34329f81f9d2588c27d828aaaf3a3d5f222da3 (patch) | |
| tree | c108d67d0f9d884778f7fd3d2a3a6097ec860c01 /utils | |
| parent | d29b0cacf3e7a1da793fc2692a958dcf6c4b9c75 (diff) | |
| parent | 23061e32c03272f65a5dd21433d34e90bdf2a7ad (diff) | |
| download | libADLMIDI-9d34329f81f9d2588c27d828aaaf3a3d5f222da3.tar.gz libADLMIDI-9d34329f81f9d2588c27d828aaaf3a3d5f222da3.tar.bz2 libADLMIDI-9d34329f81f9d2588c27d828aaaf3a3d5f222da3.zip | |
Merge branch 'master' of github.com:Wohlstand/libADLMIDI
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/gen_adldata/file_formats/load_ibk.h | 2 | ||||
| -rw-r--r-- | utils/midiplay/adlmidiplay.cpp | 2 | ||||
| -rw-r--r-- | utils/vlc_codec/libadlmidi.c | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/utils/gen_adldata/file_formats/load_ibk.h b/utils/gen_adldata/file_formats/load_ibk.h index f95a244..9d9df20 100644 --- a/utils/gen_adldata/file_formats/load_ibk.h +++ b/utils/gen_adldata/file_formats/load_ibk.h @@ -93,7 +93,7 @@ bool BankFormats::LoadIBK(BanksDump &db, const char *fn, unsigned bank, break; default: // IBK logic: make non-percussion instrument be silent -// tmp = MakeNoSoundIns(); + inst.instFlags |= BanksDump::InstrumentEntry::WOPL_Ins_IsBlank; break; } } diff --git a/utils/midiplay/adlmidiplay.cpp b/utils/midiplay/adlmidiplay.cpp index 9f2abdd..c4738e1 100644 --- a/utils/midiplay/adlmidiplay.cpp +++ b/utils/midiplay/adlmidiplay.cpp @@ -222,6 +222,8 @@ const char* volume_model_to_str(int vm) return "Apogee (fixed)"; case ADLMIDI_VolumeModel_AIL: return "AIL"; + case ADLMIDI_VolumeModel_9X_GENERIC_FM: + return "9X (Generic FM)"; } } diff --git a/utils/vlc_codec/libadlmidi.c b/utils/vlc_codec/libadlmidi.c index 18e7d31..e59826c 100644 --- a/utils/vlc_codec/libadlmidi.c +++ b/utils/vlc_codec/libadlmidi.c @@ -81,7 +81,7 @@ #define FULL_RANGE_CC74_LONGTEXT N_( \ "Scale range of CC-74 \"Brightness\" with full 0~127 range. By default is only 0~64 affects the sounding.") -static const int volume_models_values[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; +static const int volume_models_values[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; static const char * const volume_models_descriptions[] = { N_("Auto (defined by bank)"), @@ -89,10 +89,11 @@ static const char * const volume_models_descriptions[] = N_("OPL3 Native"), N_("DMX"), N_("Apogee Sound System"), - N_("Win9x driver"), + N_("Win9x SB16 driver"), N_("DMX (Fixed AM)"), N_("Apogee Sound System (Fixed AM)"), N_("Audio Interfaces Library (AIL)"), + N_("Win9x Generic FM driver"), NULL }; |