zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 07:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix incorrect parameters to PrintMidiDevice().

Browse source 
- Add music_psuedo_mididevice.cpp to CMakeLists.txt.

SVN r2873 (trunk)
This commit is contained in:
Randy Heit 2010-10-02 02:23:42 +00:00
parent b6941be55f
commit fa429ad844
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/CMakeLists.txt
View file

@ -838,6 +838,7 @@ add_executable( zdoom WIN32
sound/music_softsynth_mididevice.cpp sound/music_softsynth_mididevice.cpp
sound/music_timidity_mididevice.cpp sound/music_timidity_mididevice.cpp
sound/music_win_mididevice.cpp sound/music_win_mididevice.cpp
sound/music_psuedo_mididevice.cpp
textures/automaptexture.cpp textures/automaptexture.cpp
textures/bitmap.cpp textures/bitmap.cpp
textures/buildtexture.cpp textures/buildtexture.cpp

8
src/sound/music_midi_base.cpp
View file

@ -165,10 +165,10 @@ CCMD (snd_listmididevices)
#ifdef HAVE_FLUIDSYNTH #ifdef HAVE_FLUIDSYNTH
PrintMidiDevice (-5, "FluidSynth", MOD_SWSYNTH, 0); PrintMidiDevice (-5, "FluidSynth", MOD_SWSYNTH, 0);
#endif #endif
PrintMidiDevice (-4, "GUS", 0, MOD_SWSYNTH); PrintMidiDevice (-4, "Gravis Ultrasound Emulation", MOD_SWSYNTH, 0);
PrintMidiDevice (-3, "Emulated OPL FM Synth", MOD_FMSYNTH, 0); PrintMidiDevice (-3, "Emulated OPL FM Synth", MOD_FMSYNTH, 0);
PrintMidiDevice (-2, "TiMidity++", 0, MOD_SWSYNTH); PrintMidiDevice (-2, "TiMidity++", MOD_SWSYNTH, 0);
PrintMidiDevice (-1, "FMOD", 0, MOD_SWSYNTH); PrintMidiDevice (-1, "FMOD", MOD_SWSYNTH, 0);
if (nummididevices != 0) if (nummididevices != 0)
{ {
for (id = 0; id < nummididevices; ++id) for (id = 0; id < nummididevices; ++id)
@ -208,7 +208,7 @@ CCMD (snd_listmididevices)
#ifdef HAVE_FLUIDSYNTH #ifdef HAVE_FLUIDSYNTH
Printf("%s-5. FluidSynth\n", -5 == snd_mididevice ? TEXTCOLOR_BOLD : ""); Printf("%s-5. FluidSynth\n", -5 == snd_mididevice ? TEXTCOLOR_BOLD : "");
#endif #endif
Printf("%s-4. GUS\n", -4 == snd_mididevice ? TEXTCOLOR_BOLD : ""); Printf("%s-4. Gravis Ultrasound Emulation\n", -4 == snd_mididevice ? TEXTCOLOR_BOLD : "");
Printf("%s-3. Emulated OPL FM Synth\n", -3 == snd_mididevice ? TEXTCOLOR_BOLD : ""); Printf("%s-3. Emulated OPL FM Synth\n", -3 == snd_mididevice ? TEXTCOLOR_BOLD : "");
Printf("%s-2. TiMidity++\n", -2 == snd_mididevice ? TEXTCOLOR_BOLD : ""); Printf("%s-2. TiMidity++\n", -2 == snd_mididevice ? TEXTCOLOR_BOLD : "");
Printf("%s-1. FMOD\n", -1 == snd_mididevice ? TEXTCOLOR_BOLD : ""); Printf("%s-1. FMOD\n", -1 == snd_mididevice ? TEXTCOLOR_BOLD : "");