From 6574c345438baa0234f0730c98ad3d41a529cf1b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 3 Jan 2020 09:22:22 +0100 Subject: [PATCH] - re-enabled MIDI selection, but only with the devices that are supposed to be seen. --- source/common/music/music_midi_base.cpp | 14 ++++++++------ wadsrc/static/engine/menudef.txt | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/source/common/music/music_midi_base.cpp b/source/common/music/music_midi_base.cpp index 6c1b615f1..aab980cd0 100644 --- a/source/common/music/music_midi_base.cpp +++ b/source/common/music/music_midi_base.cpp @@ -60,10 +60,12 @@ static void AddDefaultMidiDevices(FOptionValues *opt) FOptionValues::Pair *pair = &opt->mValues[opt->mValues.Reserve(NUM_DEF_DEVICES)]; pair[0].Text = "FluidSynth"; pair[0].Value = -5.0; +#if 0 pair[1].Text = "TiMidity++"; pair[1].Value = -2.0; pair[2].Text = "OPL Synth Emulation"; pair[2].Value = -3.0; +#endif } @@ -136,13 +138,13 @@ CCMD (snd_listmididevices) MIDIOUTCAPS caps; MMRESULT res; - PrintMidiDevice(-8, "libOPN", MIDIDEV_FMSYNTH, 0); - PrintMidiDevice(-7, "libADL", MIDIDEV_FMSYNTH, 0); - PrintMidiDevice (-6, "WildMidi", MIDIDEV_SWSYNTH, 0); + //PrintMidiDevice(-8, "libOPN", MIDIDEV_FMSYNTH, 0); + //PrintMidiDevice(-7, "libADL", MIDIDEV_FMSYNTH, 0); + //PrintMidiDevice (-6, "WildMidi", MIDIDEV_SWSYNTH, 0); PrintMidiDevice (-5, "FluidSynth", MIDIDEV_SWSYNTH, 0); - PrintMidiDevice (-4, "Gravis Ultrasound Emulation", MIDIDEV_SWSYNTH, 0); - PrintMidiDevice (-3, "Emulated OPL FM Synth", MIDIDEV_FMSYNTH, 0); - PrintMidiDevice (-2, "TiMidity++", MIDIDEV_SWSYNTH, 0); + //PrintMidiDevice (-4, "Gravis Ultrasound Emulation", MIDIDEV_SWSYNTH, 0); + //PrintMidiDevice (-3, "Emulated OPL FM Synth", MIDIDEV_FMSYNTH, 0); + //PrintMidiDevice (-2, "TiMidity++", MIDIDEV_SWSYNTH, 0); if (nummididevices != 0) { for (id = 0; id < nummididevices; ++id) diff --git a/wadsrc/static/engine/menudef.txt b/wadsrc/static/engine/menudef.txt index d7bf2e013..7ba613449 100644 --- a/wadsrc/static/engine/menudef.txt +++ b/wadsrc/static/engine/menudef.txt @@ -1313,7 +1313,7 @@ OptionMenu SoundOptions //protected Option "$SNDMNU_MENUSOUND", "menu_sounds", "OnOff" // placeholder until the slider can be made to work //Slider "$SNDMNU_MENUVOLUME", "snd_menuvolume", 0, 1, 0.05, 2 StaticText " " - //Option "$SNDMNU_MIDIDEVICE", "snd_mididevice", "MidiDevices" + Option "$SNDMNU_MIDIDEVICE", "snd_mididevice", "MidiDevices" //StaticText " " //Option "$SNDMNU_UNDERWATERREVERB", "snd_waterreverb", "OnOff" Slider "$SNDMNU_ LS", "snd_numchannels", 64, 128, 8, 0