Rebase fix and move reused fileIns lambdas into cpp static functions (since effectively private)
This commit is contained in:
parent
7cd0d728b2
commit
7ae72f0fe4
3 changed files with 52 additions and 162 deletions
|
|
@ -1749,13 +1749,13 @@ int DivEngine::addSampleFromFile(const char* path) {
|
|||
}
|
||||
extS+=i;
|
||||
}
|
||||
if (extS==String(".dmc")) { // read as .dmc
|
||||
if (extS==".dmc") { // read as .dmc
|
||||
size_t len=0;
|
||||
DivSample* sample=new DivSample;
|
||||
int sampleCount=(int)song.sample.size();
|
||||
sample->name=stripPath;
|
||||
|
||||
FILE* f=fopen(path,"rb");
|
||||
FILE* f=ps_fopen(path,"rb");
|
||||
if (f==NULL) {
|
||||
BUSY_END;
|
||||
lastError=fmt::sprintf("could not open file! (%s)",strerror(errno));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue