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

5
libraries/timidity/timidity.cpp
View file

@ -28,7 +28,6 @@
#include <string.h>
#include "timidity.h"
#include "timidity_file.h"
#include "common.h"
#include "instrum.h"
#include "playmidi.h"
@ -188,7 +187,7 @@ int Instruments::read_config_file(const char *name)
printMessage(CMSG_ERROR, VERB_NORMAL, "Timidity: Probable source loop in configuration files\n");
return (-1);
}
auto fp = sfreader->open_timidity_file(name);
auto fp = sfreader->open_file(name);
if (!fp)
{
printMessage(CMSG_ERROR, VERB_NORMAL, "Timidity: Unable to open config file\n");
@ -400,7 +399,7 @@ int Instruments::read_config_file(const char *name)
for (i = 1; i < words; i++)
{
// Q: How does this deal with relative paths? In this form it just does not work.
sfreader->timidity_add_path(w[i]);
sfreader->add_search_path(w[i]);
}
}
else if (!strcmp(w[0], "source"))