--- src/CMakeLists.txt +++ src/CMakeLists.txt @@ -1230,7 +1230,6 @@ add_executable( zdoom WIN32 MACOSX_BUNDL sound/music_fluidsynth_mididevice.cpp sound/music_softsynth_mididevice.cpp sound/music_timidity_mididevice.cpp - sound/music_wildmidi_mididevice.cpp sound/music_win_mididevice.cpp sound/oalsound.cpp sound/sndfile_decoder.cpp @@ -1274,11 +1273,6 @@ add_executable( zdoom WIN32 MACOSX_BUNDL timidity/playmidi.cpp timidity/resample.cpp timidity/timidity.cpp - wildmidi/file_io.cpp - wildmidi/gus_pat.cpp - wildmidi/reverb.cpp - wildmidi/wildmidi_lib.cpp - wildmidi/wm_error.cpp xlat/parse_xlat.cpp fragglescript/t_fspic.cpp fragglescript/t_func.cpp @@ -1416,8 +1410,6 @@ source_group("Audio Files\\OPL Synth" RE source_group("Audio Files\\OPL Synth\\DOSBox" FILES oplsynth/dosbox/opl.cpp oplsynth/dosbox/opl.h) source_group("Audio Files\\Timidity\\Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/timidity/.+\\.h$") source_group("Audio Files\\Timidity\\Source" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/timidity/.+\\.cpp$") -source_group("Audio Files\\WildMidi\\Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/wildmidi/.+\\.h$") -source_group("Audio Files\\WildMidi\\Source" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/wildmidi/.+\\.cpp$") source_group("Decorate++" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/thingdef/.+") source_group("FraggleScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/fragglescript/.+") source_group("Games\\Doom Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_doom/.+") --- src/s_advsound.cpp +++ src/s_advsound.cpp @@ -1376,7 +1376,6 @@ static void S_AddSNDINFO (int lump) else if (sc.Compare("default")) devset.device = MDEV_DEFAULT; else if (sc.Compare("fluidsynth")) devset.device = MDEV_FLUIDSYNTH; else if (sc.Compare("gus")) devset.device = MDEV_GUS; - else if (sc.Compare("wildmidi")) devset.device = MDEV_WILDMIDI; else sc.ScriptError("Unknown MIDI device %s\n", sc.String); if (sc.CheckString(",")) --- src/sound/i_music.cpp +++ src/sound/i_music.cpp @@ -189,7 +189,6 @@ void I_ShutdownMusic(bool onexit) assert (currSong == NULL); } Timidity::FreeAll(); - if (onexit) WildMidi_Shutdown(); #ifdef _WIN32 I_ShutdownMusicWin32(); #endif // _WIN32 @@ -286,10 +285,6 @@ void MusInfo::FluidSettingStr(const char { } -void MusInfo::WildMidiSetOption(int opt, int set) -{ -} - FString MusInfo::GetStats() { return "No stats available for this song"; --- src/sound/i_music.h +++ src/sound/i_music.h @@ -83,7 +83,6 @@ public: virtual void FluidSettingInt(const char *setting, int value); // FluidSynth settings virtual void FluidSettingNum(const char *setting, double value); // " virtual void FluidSettingStr(const char *setting, const char *value); // " - virtual void WildMidiSetOption(int opt, int set); void Start(bool loop, float rel_vol = -1.f, int subsong = 0); --- src/sound/i_musicinterns.h +++ src/sound/i_musicinterns.h @@ -24,7 +24,6 @@ #include "i_music.h" #include "s_sound.h" #include "files.h" -#include "wildmidi/wildmidi_lib.h" void I_InitMusicWin32 (); void I_ShutdownMusicWin32 (); @@ -102,7 +101,6 @@ public: virtual void FluidSettingInt(const char *setting, int value); virtual void FluidSettingNum(const char *setting, double value); virtual void FluidSettingStr(const char *setting, const char *value); - virtual void WildMidiSetOption(int opt, int set); virtual bool Preprocess(MIDIStreamer *song, bool looping); virtual FString GetStats(); }; @@ -332,27 +330,6 @@ protected: FILE *File; }; -// WildMidi implementation of a MIDI device --------------------------------- - -class WildMIDIDevice : public SoftSynthMIDIDevice -{ -public: - WildMIDIDevice(const char *args); - ~WildMIDIDevice(); - - int Open(void (*callback)(unsigned int, void *, DWORD, DWORD), void *userdata); - void PrecacheInstruments(const WORD *instruments, int count); - FString GetStats(); - -protected: - WildMidi_Renderer *Renderer; - - void HandleEvent(int status, int parm1, int parm2); - void HandleLongEvent(const BYTE *data, int len); - void ComputeOutput(float *buffer, int len); - void WildMidiSetOption(int opt, int set); -}; - // FluidSynth implementation of a MIDI device ------------------------------- #ifdef HAVE_FLUIDSYNTH @@ -449,7 +426,6 @@ public: void FluidSettingInt(const char *setting, int value); void FluidSettingNum(const char *setting, double value); void FluidSettingStr(const char *setting, const char *value); - void WildMidiSetOption(int opt, int set); void CreateSMF(TArray &file, int looplimit=0); protected: --- src/sound/music_midistream.cpp +++ src/sound/music_midistream.cpp @@ -293,8 +293,6 @@ MIDIDevice *MIDIStreamer::CreateMIDIDevi case MDEV_TIMIDITY: return new TimidityPPMIDIDevice(Args); - case MDEV_WILDMIDI: - return new WildMIDIDevice(Args); default: return NULL; @@ -633,21 +631,6 @@ void MIDIStreamer::FluidSettingStr(const //========================================================================== // -// MIDIDeviceStreamer :: WildMidiSetOption -// -//========================================================================== - -void MIDIStreamer::WildMidiSetOption(int opt, int set) -{ - if (MIDI != NULL) - { - MIDI->WildMidiSetOption(opt, set); - } -} - - -//========================================================================== -// // MIDIStreamer :: OutputVolume // // Signals the buffer filler to send volume change events on all channels. @@ -1544,16 +1527,6 @@ void MIDIDevice::FluidSettingStr(const c //========================================================================== // -// MIDIDevice :: WildMidiSetOption -// -//========================================================================== - -void MIDIDevice::WildMidiSetOption(int opt, int set) -{ -} - -//========================================================================== -// // MIDIDevice :: GetStats // //========================================================================== --- wadsrc/static/menudef.txt +++ wadsrc/static/menudef.txt @@ -1619,10 +1619,6 @@ OptionMenu AdvSoundOptions Option "Reverb", "timidity_reverb", "OnOff" Option "Chorus", "timidity_chorus", "OnOff" Slider "Relative volume", "timidity_mastervolume", 0, 4, 0.2, 1 - StaticText " " - StaticText "WildMidi", 1 - TextField "WildMidi config file", "wildmidi_config" - Option "Reverb", "wildmidi_reverb", "OnOff" } /*=======================================