etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spelling change: Rom -> ROM - PLEASE READ 

@Grauw: please update your MultiPCM code.
i know it's just a trivial change I made, but in my opinion "ROM"
indicates it's an acronym...
This commit is contained in:
tildearrow 2022-05-12 22:15:03 -05:00
parent 9bac00efe5
commit 1b4256bb28
5 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/engine/engine.cpp
View File

@ -491,7 +491,7 @@ void DivEngine::notifyWaveChange(int wave) {
BUSY_END; BUSY_END;
} }
int DivEngine::loadSampleRom(String path, ssize_t expectedSize, unsigned char*& ret) { int DivEngine::loadSampleROM(String path, ssize_t expectedSize, unsigned char*& ret) {
ret = NULL; ret = NULL;
if (path.empty()) { if (path.empty()) {
return 0; return 0;
@ -551,14 +551,23 @@ int DivEngine::loadSampleRom(String path, ssize_t expectedSize, unsigned char*&
return 0; return 0;
} }
int DivEngine::loadSampleRoms() { int DivEngine::loadSampleROMs() {
delete[] yrw801Rom; if (yrw801ROM!=NULL) {
delete[] tg100Rom; delete[] yrw801ROM;
delete[] mu5Rom; yrw801ROM=NULL;
}
if (tg100ROM!=NULL) {
delete[] tg100ROM;
tg100ROM=NULL;
}
if (mu5ROM!=NULL) {
delete[] mu5ROM;
mu5ROM=NULL;
}
int error = 0; int error = 0;
error += loadSampleRom(getConfString("yrw801Path",""), 0x200000, yrw801Rom); error += loadSampleROM(getConfString("yrw801Path",""), 0x200000, yrw801ROM);
error += loadSampleRom(getConfString("tg100Path",""), 0x200000, tg100Rom); error += loadSampleROM(getConfString("tg100Path",""), 0x200000, tg100ROM);
error += loadSampleRom(getConfString("mu5Path",""), 0x200000, mu5Rom); error += loadSampleROM(getConfString("mu5Path",""), 0x200000, mu5ROM);
return error; return error;
} }
@ -2779,7 +2788,7 @@ bool DivEngine::init() {
loadConf(); loadConf();
loadSampleRoms(); loadSampleROMs();
// set default system preset // set default system preset
if (!hasLoadedSomething) { if (!hasLoadedSomething) {
@ -2854,8 +2863,8 @@ bool DivEngine::quit() {
active=false; active=false;
delete[] oscBuf[0]; delete[] oscBuf[0];
delete[] oscBuf[1]; delete[] oscBuf[1];
delete[] yrw801Rom; if (yrw801ROM!=NULL) delete[] yrw801ROM;
delete[] tg100Rom; if (tg100ROM!=NULL) delete[] tg100ROM;
delete[] mu5Rom; if (mu5ROM!=NULL) delete[] mu5ROM;
return true; return true;
} }

16
src/engine/engine.h
View File

@ -397,7 +397,7 @@ class DivEngine {
void loadOPM(SafeReader& reader, std::vector<DivInstrument*>& ret, String& stripPath); void loadOPM(SafeReader& reader, std::vector<DivInstrument*>& ret, String& stripPath);
void loadFF(SafeReader& reader, std::vector<DivInstrument*>& ret, String& stripPath); void loadFF(SafeReader& reader, std::vector<DivInstrument*>& ret, String& stripPath);
int loadSampleRom(String path, ssize_t expectedSize, unsigned char*& ret); int loadSampleROM(String path, ssize_t expectedSize, unsigned char*& ret);
bool initAudioBackend(); bool initAudioBackend();
bool deinitAudioBackend(); bool deinitAudioBackend();
@ -786,7 +786,7 @@ class DivEngine {
const char** getRegisterSheet(int sys); const char** getRegisterSheet(int sys);
// load sample ROMs // load sample ROMs
int loadSampleRoms(); int loadSampleROMs();
// UNSAFE render samples - only execute when locked // UNSAFE render samples - only execute when locked
void renderSamples(); void renderSamples();
@ -861,9 +861,9 @@ class DivEngine {
// terminate the engine. // terminate the engine.
bool quit(); bool quit();
unsigned char* yrw801Rom; unsigned char* yrw801ROM;
unsigned char* tg100Rom; unsigned char* tg100ROM;
unsigned char* mu5Rom; unsigned char* mu5ROM;
DivEngine(): DivEngine():
output(NULL), output(NULL),
@ -940,9 +940,9 @@ class DivEngine {
oscWritePos(0), oscWritePos(0),
tickMult(1), tickMult(1),
processTime(0), processTime(0),
yrw801Rom(NULL), yrw801ROM(NULL),
tg100Rom(NULL), tg100ROM(NULL),
mu5Rom(NULL) { mu5ROM(NULL) {
memset(isMuted,0,DIV_MAX_CHANS*sizeof(bool)); memset(isMuted,0,DIV_MAX_CHANS*sizeof(bool));
memset(keyHit,0,DIV_MAX_CHANS*sizeof(bool)); memset(keyHit,0,DIV_MAX_CHANS*sizeof(bool));
memset(dispatchChanOfChan,0,DIV_MAX_CHANS*sizeof(int)); memset(dispatchChanOfChan,0,DIV_MAX_CHANS*sizeof(int));

4
src/gui/gui.cpp
View File

@ -1516,7 +1516,7 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
{"compatible files", "*.rom *.bin", {"compatible files", "*.rom *.bin",
"all files", ".*"}, "all files", ".*"},
"compatible files{.rom,.bin},.*", "compatible files{.rom,.bin},.*",
workingDirRom, workingDirROM,
dpiScale dpiScale
); );
break; break;
@ -3040,7 +3040,7 @@ bool FurnaceGUI::loop() {
case GUI_FILE_YRW801_ROM_OPEN: case GUI_FILE_YRW801_ROM_OPEN:
case GUI_FILE_TG100_ROM_OPEN: case GUI_FILE_TG100_ROM_OPEN:
case GUI_FILE_MU5_ROM_OPEN: case GUI_FILE_MU5_ROM_OPEN:
workingDirRom=fileDialog->getPath()+DIR_SEPARATOR_STR; workingDirROM=fileDialog->getPath()+DIR_SEPARATOR_STR;
break; break;
} }
if (fileDialog->accepted()) { if (fileDialog->accepted()) {

2
src/gui/gui.h
View File

@ -768,7 +768,7 @@ class FurnaceGUI {
bool updateSampleTex; bool updateSampleTex;
String workingDir, fileName, clipboard, warnString, errorString, lastError, curFileName, nextFile; String workingDir, fileName, clipboard, warnString, errorString, lastError, curFileName, nextFile;
String workingDirSong, workingDirIns, workingDirWave, workingDirSample, workingDirAudioExport, workingDirVGMExport, workingDirFont, workingDirColors, workingDirKeybinds, workingDirLayout, workingDirRom; String workingDirSong, workingDirIns, workingDirWave, workingDirSample, workingDirAudioExport, workingDirVGMExport, workingDirFont, workingDirColors, workingDirKeybinds, workingDirLayout, workingDirROM;
String mmlString[17]; String mmlString[17];
String mmlStringW; String mmlStringW;

6
src/gui/settings.cpp
View File

@ -1990,7 +1990,7 @@ void FurnaceGUI::syncSettings() {
} }
void FurnaceGUI::commitSettings() { void FurnaceGUI::commitSettings() {
bool sampleRomsChanged = settings.yrw801Path!=e->getConfString("yrw801Path","") || bool sampleROMsChanged = settings.yrw801Path!=e->getConfString("yrw801Path","") ||
settings.tg100Path!=e->getConfString("tg100Path","") || settings.tg100Path!=e->getConfString("tg100Path","") ||
settings.mu5Path!=e->getConfString("mu5Path",""); settings.mu5Path!=e->getConfString("mu5Path","");
@ -2100,8 +2100,8 @@ void FurnaceGUI::commitSettings() {
e->saveConf(); e->saveConf();
if (sampleRomsChanged) { if (sampleROMsChanged) {
if (e->loadSampleRoms()) { if (e->loadSampleROMs()) {
showError(e->getLastError()); showError(e->getLastError());
} }
} }