From 3c3c2f03e86e1f5239eaa7de025e8b6d801f271e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 26 Mar 2018 20:44:25 +0200 Subject: [PATCH] The missing parts of last commit. --- src/sound/mididevices/music_fluidsynth_mididevice.cpp | 2 +- src/sound/mididevices/music_timiditypp_mididevice.cpp | 2 +- src/sound/timidity/timidity.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/sound/mididevices/music_fluidsynth_mididevice.cpp b/src/sound/mididevices/music_fluidsynth_mididevice.cpp index 97282299f..9e3d9d430 100644 --- a/src/sound/mididevices/music_fluidsynth_mididevice.cpp +++ b/src/sound/mididevices/music_fluidsynth_mididevice.cpp @@ -105,7 +105,7 @@ const char *BaseFileSearch(const char *file, const char *ext, bool lookfirstinpr CVAR(String, fluid_lib, "", CVAR_ARCHIVE|CVAR_GLOBALCONFIG) -CUSTOM_CVAR(String, fluid_patchset, "", CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +CUSTOM_CVAR(String, fluid_patchset, "gzdoom", CVAR_ARCHIVE | CVAR_GLOBALCONFIG) { if (currSong != nullptr && currSong->GetDeviceType() == MDEV_FLUIDSYNTH) { diff --git a/src/sound/mididevices/music_timiditypp_mididevice.cpp b/src/sound/mididevices/music_timiditypp_mididevice.cpp index 40205840f..df91d1d44 100644 --- a/src/sound/mididevices/music_timiditypp_mididevice.cpp +++ b/src/sound/mididevices/music_timiditypp_mididevice.cpp @@ -78,7 +78,7 @@ protected: TimidityPlus::Instruments *TimidityPPMIDIDevice::instruments; // Config file to use -CUSTOM_CVAR(String, timidity_config, "timidity.cfg", CVAR_ARCHIVE | CVAR_GLOBALCONFIG) +CUSTOM_CVAR(String, timidity_config, "gzdoom", CVAR_ARCHIVE | CVAR_GLOBALCONFIG) { if (currSong != nullptr && currSong->GetDeviceType() == MDEV_TIMIDITY) { diff --git a/src/sound/timidity/timidity.h b/src/sound/timidity/timidity.h index f297f35bb..385a62896 100644 --- a/src/sound/timidity/timidity.h +++ b/src/sound/timidity/timidity.h @@ -86,9 +86,6 @@ config.h #define MAX_AMPLIFICATION 800 -/* The TiMiditiy configuration file */ -#define CONFIG_FILE "timidity.cfg" - typedef float sample_t; typedef float final_volume_t; #define FINAL_VOLUME(v) (v)