etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-15 17:25:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Address review comments take 2

Browse source
This commit is contained in:
James Alan Nguyen 2022-04-17 15:54:00 +10:00
parent ac656f07bb
commit d1fadf1076
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/engine/fileOpsIns.cpp
View file

@ -101,7 +101,7 @@ void DivEngine::loadDMP(SafeReader& reader, std::vector<DivInstrument*>& ret, St
logD(".dmp version %d",version); logD(".dmp version %d",version);
} catch (EndOfFileException& e) { } catch (EndOfFileException& e) {
lastError="premature end of file"; lastError="premature end of file";
logE(lastError.c_str()); logE("premature end of file");
delete ins; delete ins;
return; return;
} }
@ -160,7 +160,7 @@ void DivEngine::loadDMP(SafeReader& reader, std::vector<DivInstrument*>& ret, St
} }
} catch (EndOfFileException& e) { } catch (EndOfFileException& e) {
lastError="premature end of file"; lastError="premature end of file";
logE(lastError.c_str()); logE("premature end of file");
delete ins; delete ins;
return; return;
} }
@ -352,7 +352,7 @@ void DivEngine::loadDMP(SafeReader& reader, std::vector<DivInstrument*>& ret, St
} }
} catch (EndOfFileException& e) { } catch (EndOfFileException& e) {
lastError="premature end of file"; lastError="premature end of file";
logE(lastError.c_str()); logE("premature end of file");
delete ins; delete ins;
return; return;
} }
@ -387,7 +387,7 @@ void DivEngine::loadTFI(SafeReader& reader, std::vector<DivInstrument*>& ret, St
} }
} catch (EndOfFileException& e) { } catch (EndOfFileException& e) {
lastError="premature end of file"; lastError="premature end of file";
logE(lastError.c_str()); logE("premature end of file");
delete ins; delete ins;
return; return;
} }
@ -429,7 +429,7 @@ void DivEngine::loadVGI(SafeReader& reader, std::vector<DivInstrument*>& ret, St
} }
} catch (EndOfFileException& e) { } catch (EndOfFileException& e) {
lastError="premature end of file"; lastError="premature end of file";
logE(lastError.c_str()); logE("premature end of file");
delete ins; delete ins;
return; return;
} }
@ -496,7 +496,7 @@ void DivEngine::loadS3I(SafeReader& reader, std::vector<DivInstrument*>& ret, St
reader.seek(21, SEEK_CUR); reader.seek(21, SEEK_CUR);
} else { } else {
lastError = "S3I PCM samples currently not supported."; lastError = "S3I PCM samples currently not supported.";
logE(lastError.c_str()); logE("S3I PCM samples currently not supported.");
} }
ins->name = reader.readString(28); ins->name = reader.readString(28);
ins->name = (ins->name.length() == 0) ? stripPath : ins->name; ins->name = (ins->name.length() == 0) ? stripPath : ins->name;
@ -504,12 +504,12 @@ void DivEngine::loadS3I(SafeReader& reader, std::vector<DivInstrument*>& ret, St
int s3i_signature = reader.readI(); int s3i_signature = reader.readI();
if (s3i_signature != 0x49524353) { if (s3i_signature != 0x49524353) {
warnings = "S3I signature invalid."; addWarning("S3I signature invalid.");
logW(lastError.c_str()); logW("S3I signature invalid.");
}; };
} catch (EndOfFileException& e) { } catch (EndOfFileException& e) {
lastError = "premature end of file"; lastError = "premature end of file";
logE(lastError.c_str()); logE("premature end of file");
delete ins; delete ins;
return; return;
} }
@ -630,7 +630,7 @@ void DivEngine::loadSBI(SafeReader& reader, std::vector<DivInstrument*>& ret, St
} catch (EndOfFileException& e) { } catch (EndOfFileException& e) {
lastError = "premature end of file"; lastError = "premature end of file";
logE(lastError.c_str()); logE("premature end of file");
delete ins; delete ins;
} }
} }
@ -712,7 +712,7 @@ void DivEngine::loadBNK(SafeReader& reader, std::vector<DivInstrument*>& ret, St
} catch (EndOfFileException& e) { } catch (EndOfFileException& e) {
lastError = "premature end of file"; lastError = "premature end of file";
logE(lastError.c_str()); logE("premature end of file");
for (int i = readCount; i >= 0; --i) { for (int i = readCount; i >= 0; --i) {
delete insList[i]; delete insList[i];
} }
@ -722,7 +722,7 @@ void DivEngine::loadBNK(SafeReader& reader, std::vector<DivInstrument*>& ret, St
} else { } else {
// assume GEMS BNK for now. // assume GEMS BNK for now.
lastError = "GEMS BNK currently not supported."; lastError = "GEMS BNK currently not supported.";
logE(lastError.c_str()); logE("GEMS BNK currently not supported.");
} }
if (!is_failed) { if (!is_failed) {
@ -797,7 +797,7 @@ void DivEngine::loadFF(SafeReader& reader, std::vector<DivInstrument*>& ret, Str
} }
} catch (EndOfFileException& e) { } catch (EndOfFileException& e) {
lastError = "premature end of file"; lastError = "premature end of file";
logE(lastError.c_str()); logE("premature end of file");
for (int i = readCount; i >= 0; --i) { for (int i = readCount; i >= 0; --i) {
delete insList[i]; delete insList[i];
} }
@ -818,7 +818,7 @@ void DivEngine::loadOPM(SafeReader& reader, std::vector<DivInstrument*>& ret, St
} catch (EndOfFileException& e) { } catch (EndOfFileException& e) {
lastError="premature end of file"; lastError="premature end of file";
logE(lastError.c_str()); logE("premature end of file");
return; return;
} }
} }
@ -916,7 +916,7 @@ std::vector<DivInstrument*> DivEngine::instrumentFromFile(const char* path) {
} }
} catch (EndOfFileException& e) { } catch (EndOfFileException& e) {
lastError="premature end of file"; lastError="premature end of file";
logE(lastError.c_str()); logE("premature end of file");
delete ins; delete ins;
delete[] buf; delete[] buf;
return ret; return ret;