zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- allow reloading the sound font for the GUS device.

Browse source
This commit is contained in:
Christoph Oelckers 2018-02-21 23:38:04 +01:00
parent e84ec2978a
commit 0688d53ea8
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/sound/timidity/timidity.cpp
View file

@ -67,6 +67,8 @@ static int read_config_file(const char *name, bool ismain)
if (!(fp = pathExpander.openFileReader(name, &lumpnum)))
return -1;
FreeAll();
if (ismain)
{
if (lumpnum > 0)
@ -516,6 +518,8 @@ void FreeAll()
}
}
static FString currentConfig;
int LoadConfig(const char *filename)
{
/* !!! FIXME: This may be ugly, but slightly less so than requiring the
@ -525,6 +529,8 @@ int LoadConfig(const char *filename)
* file itself since that file should contain any other directory
* that needs to be added to the search path.
*/
if (currentConfig.CompareNoCase(filename) == 0) return 0;
currentConfig = filename;
pathExpander.clearPathlist();
#ifdef _WIN32
pathExpander.addToPathlist("C:\\TIMIDITY");
@ -560,6 +566,8 @@ int LoadConfig()
int LoadDMXGUS()
{
if (currentConfig.CompareNoCase("DMXGUS") == 0) return 0;
int lump = Wads.CheckNumForName("DMXGUS");
if (lump == -1) lump = Wads.CheckNumForName("DMXGUSC");
if (lump == -1) return LoadConfig(midi_config);
@ -567,6 +575,9 @@ int LoadDMXGUS()
FWadLump data = Wads.OpenLumpNum(lump);
if (data.GetLength() == 0) return LoadConfig(midi_config);
currentConfig = "DMXGUS";
FreeAll();
// The GUS put its patches in %ULTRADIR%/MIDI so we can try that
FString ultradir = getenv("ULTRADIR");
if (ultradir.IsNotEmpty())
@ -684,7 +695,13 @@ void FreeDLS(DLS_Data *data);
Renderer::Renderer(float sample_rate, const char *args)
{
// 'args' should be used to load a custom config or DMXGUS, but since setup currently requires a snd_reset call, this will need some refactoring first
// Load explicitly stated sound font if so desired.
if (args != nullptr)
{
if (!stricmp(args, "DMXGUS")) LoadDMXGUS();
LoadConfig(args);
}
rate = sample_rate;
patches = NULL;
resample_buffer_size = 0;