OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- consolidated the different file access interfaces in the backends into one shared version.

Browse source 
This was getting a bit unwieldy. The include path setup is not perfect yet, that's work for later.
(It's about time we're getting C++20 with modules so that this include path madness can be put to an end.)
This commit is contained in:
Christoph Oelckers 2019-09-28 23:17:16 +02:00
commit 7468c0f36d
28 changed files with 504 additions and 634 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libraries/timidityplus/configfile.cpp
View file

@ -615,7 +615,7 @@ char *Instruments::expand_variables(char *string, MBlockList *varbuf, const char
int Instruments::read_config_file(const char *name, int self, int allow_missing_file)
{
struct timidity_file *tf;
timidity_file *tf;
char buf[1024], *tmp, *w[MAXWORDS + 1], *cp;
ToneBank *bank = NULL;
int i, j, k, line = 0, words, errcnt = 0;
@ -1397,7 +1397,7 @@ int Instruments::read_config_file(const char *name, int self, int allow_missing_
continue;
}
for (i = 1; i < words; i++)
sfreader->timidityplus_add_path(w[i]);
sfreader->add_search_path(w[i]);
}
else if (!strcmp(w[0], "source") || !strcmp(w[0], "trysource"))
{