zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 23:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

The missing parts of last commit.

Browse source
This commit is contained in:
Christoph Oelckers 2018-03-26 20:44:25 +02:00
parent 7c333b1fd1
commit 3c3c2f03e8
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sound/mididevices/music_fluidsynth_mididevice.cpp
View file

@ -105,7 +105,7 @@ const char *BaseFileSearch(const char *file, const char *ext, bool lookfirstinpr
CVAR(String, fluid_lib, "", CVAR_ARCHIVE|CVAR_GLOBALCONFIG) 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) if (currSong != nullptr && currSong->GetDeviceType() == MDEV_FLUIDSYNTH)
{ {

2
src/sound/mididevices/music_timiditypp_mididevice.cpp
View file

@ -78,7 +78,7 @@ protected:
TimidityPlus::Instruments *TimidityPPMIDIDevice::instruments; TimidityPlus::Instruments *TimidityPPMIDIDevice::instruments;
// Config file to use // 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) if (currSong != nullptr && currSong->GetDeviceType() == MDEV_TIMIDITY)
{ {

3
src/sound/timidity/timidity.h
View file

@ -86,9 +86,6 @@ config.h
#define MAX_AMPLIFICATION 800 #define MAX_AMPLIFICATION 800
/* The TiMiditiy configuration file */
#define CONFIG_FILE "timidity.cfg"
typedef float sample_t; typedef float sample_t;
typedef float final_volume_t; typedef float final_volume_t;
#define FINAL_VOLUME(v) (v) #define FINAL_VOLUME(v) (v)