zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- re-enabled MIDI selection, but only with the devices that are supposed to be seen.

Browse source
This commit is contained in:
Christoph Oelckers 2020-01-03 09:22:22 +01:00
parent a6c2641c20
commit 6574c34543
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/common/music/music_midi_base.cpp
View file

@ -60,10 +60,12 @@ static void AddDefaultMidiDevices(FOptionValues *opt)
FOptionValues::Pair *pair = &opt->mValues[opt->mValues.Reserve(NUM_DEF_DEVICES)]; FOptionValues::Pair *pair = &opt->mValues[opt->mValues.Reserve(NUM_DEF_DEVICES)];
pair[0].Text = "FluidSynth"; pair[0].Text = "FluidSynth";
pair[0].Value = -5.0; pair[0].Value = -5.0;
#if 0
pair[1].Text = "TiMidity++"; pair[1].Text = "TiMidity++";
pair[1].Value = -2.0; pair[1].Value = -2.0;
pair[2].Text = "OPL Synth Emulation"; pair[2].Text = "OPL Synth Emulation";
pair[2].Value = -3.0; pair[2].Value = -3.0;
#endif
} }
@ -136,13 +138,13 @@ CCMD (snd_listmididevices)
MIDIOUTCAPS caps; MIDIOUTCAPS caps;
MMRESULT res; MMRESULT res;
PrintMidiDevice(-8, "libOPN", MIDIDEV_FMSYNTH, 0); //PrintMidiDevice(-8, "libOPN", MIDIDEV_FMSYNTH, 0);
PrintMidiDevice(-7, "libADL", MIDIDEV_FMSYNTH, 0); //PrintMidiDevice(-7, "libADL", MIDIDEV_FMSYNTH, 0);
PrintMidiDevice (-6, "WildMidi", MIDIDEV_SWSYNTH, 0); //PrintMidiDevice (-6, "WildMidi", MIDIDEV_SWSYNTH, 0);
PrintMidiDevice (-5, "FluidSynth", MIDIDEV_SWSYNTH, 0); PrintMidiDevice (-5, "FluidSynth", MIDIDEV_SWSYNTH, 0);
PrintMidiDevice (-4, "Gravis Ultrasound Emulation", MIDIDEV_SWSYNTH, 0); //PrintMidiDevice (-4, "Gravis Ultrasound Emulation", MIDIDEV_SWSYNTH, 0);
PrintMidiDevice (-3, "Emulated OPL FM Synth", MIDIDEV_FMSYNTH, 0); //PrintMidiDevice (-3, "Emulated OPL FM Synth", MIDIDEV_FMSYNTH, 0);
PrintMidiDevice (-2, "TiMidity++", MIDIDEV_SWSYNTH, 0); //PrintMidiDevice (-2, "TiMidity++", MIDIDEV_SWSYNTH, 0);
if (nummididevices != 0) if (nummididevices != 0)
{ {
for (id = 0; id < nummididevices; ++id) for (id = 0; id < nummididevices; ++id)

2
wadsrc/static/engine/menudef.txt
View file

@ -1313,7 +1313,7 @@ OptionMenu SoundOptions //protected
Option "$SNDMNU_MENUSOUND", "menu_sounds", "OnOff" // placeholder until the slider can be made to work 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 //Slider "$SNDMNU_MENUVOLUME", "snd_menuvolume", 0, 1, 0.05, 2
StaticText " " StaticText " "
//Option "$SNDMNU_MIDIDEVICE", "snd_mididevice", "MidiDevices" Option "$SNDMNU_MIDIDEVICE", "snd_mididevice", "MidiDevices"
//StaticText " " //StaticText " "
//Option "$SNDMNU_UNDERWATERREVERB", "snd_waterreverb", "OnOff" //Option "$SNDMNU_UNDERWATERREVERB", "snd_waterreverb", "OnOff"
Slider "$SNDMNU_ LS", "snd_numchannels", 64, 128, 8, 0 Slider "$SNDMNU_ LS", "snd_numchannels", 64, 128, 8, 0