- thinned out the FSoundFontReader interface a bit more by moving the file open code into the FSoundFontReader class itself.
This commit is contained in:
parent
2cf8cc47df
commit
16ab52c5f3
4 changed files with 47 additions and 20 deletions
|
|
@ -129,25 +129,7 @@ double flt_rand()
|
|||
|
||||
struct timidity_file *open_file(const char *name, SoundFontReaderInterface *sfreader)
|
||||
{
|
||||
FileReader fr;
|
||||
FString filename;
|
||||
if (name == nullptr)
|
||||
{
|
||||
fr = sfreader->OpenMainConfigFile();
|
||||
filename = sfreader->MainConfigFileName();
|
||||
}
|
||||
else
|
||||
{
|
||||
auto res = sfreader->LookupFile(name);
|
||||
fr = std::move(res.first);
|
||||
filename = res.second;
|
||||
}
|
||||
if (!fr.isOpen()) return nullptr;
|
||||
|
||||
auto tf = new timidity_file;
|
||||
tf->url = std::move(fr);
|
||||
tf->filename = filename.GetChars();
|
||||
return tf;
|
||||
return sfreader->open_timidity_file(name);
|
||||
}
|
||||
|
||||
/* This closes files opened with open_file */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue