- consolidated the different file access interfaces in the backends into one shared version.
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:
parent
d94b63b486
commit
7468c0f36d
28 changed files with 504 additions and 634 deletions
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
#include "t_swap.h"
|
||||
#include "timidity.h"
|
||||
#include "timidity_file.h"
|
||||
#include "common.h"
|
||||
#include "instrum.h"
|
||||
#include "playmidi.h"
|
||||
|
|
@ -1506,7 +1505,7 @@ void SFFile::ApplyGeneratorsToRegion(SFGenComposite *gen, SFSample *sfsamp, Rend
|
|||
|
||||
void SFFile::LoadSample(Renderer *song, SFSample *sample)
|
||||
{
|
||||
auto fp = song->instruments->sfreader->open_timidity_file(Filename.c_str());
|
||||
auto fp = song->instruments->sfreader->open_file(Filename.c_str());
|
||||
uint32_t i;
|
||||
|
||||
if (!fp)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue