otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

new floating-point volumes and patchbay

Browse source
This commit is contained in:
tildearrow 2023-01-06 17:43:08 -05:00
parent 7f5cdd6f6b
commit 6273275b47
10 changed files with 985 additions and 853 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/engine/fileOps.cpp
View file

@ -939,13 +939,13 @@ bool DivEngine::loadDMF(unsigned char* file, size_t len) {
ds.systemLen=2;
ds.system[0]=DIV_SYSTEM_YM2612;
ds.system[1]=DIV_SYSTEM_SMS;
ds.systemVol[1]=32;
ds.systemVol[1]=0.5f;
}
if (ds.system[0]==DIV_SYSTEM_GENESIS_EXT) {
ds.systemLen=2;
ds.system[0]=DIV_SYSTEM_YM2612_EXT;
ds.system[1]=DIV_SYSTEM_SMS;
ds.systemVol[1]=32;
ds.systemVol[1]=0.5f;
}
if (ds.system[0]==DIV_SYSTEM_ARCADE) {
ds.systemLen=2;
@ -1830,14 +1830,18 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
// system volume
for (int i=0; i<DIV_MAX_CHIPS; i++) {
ds.systemVol[i]=reader.readC();
signed char oldSysVol=reader.readC();
ds.systemVol[i]=(float)oldSysVol/64.0f;
if (ds.version<59 && ds.system[i]==DIV_SYSTEM_NES) {
ds.systemVol[i]/=4;
}
}
// system panning
for (int i=0; i<DIV_MAX_CHIPS; i++) ds.systemPan[i]=reader.readC();
for (int i=0; i<DIV_MAX_CHIPS; i++) {
signed char oldSysPan=reader.readC();
ds.systemPan[i]=(float)oldSysPan/127.0f;
}
// system props
for (int i=0; i<DIV_MAX_CHIPS; i++) {
@ -1860,14 +1864,14 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
ds.system[i]=DIV_SYSTEM_YM2612;
if (i<31) {
ds.system[i+1]=DIV_SYSTEM_SMS;
ds.systemVol[i+1]=(((ds.systemVol[i]&127)*3)>>3)|(ds.systemVol[i]&128);
ds.systemVol[i+1]=ds.systemVol[i]*0.375f;
}
}
if (ds.system[i]==DIV_SYSTEM_GENESIS_EXT) {
ds.system[i]=DIV_SYSTEM_YM2612_EXT;
if (i<31) {
ds.system[i+1]=DIV_SYSTEM_SMS;
ds.systemVol[i+1]=(((ds.systemVol[i]&127)*3)>>3)|(ds.systemVol[i]&128);
ds.systemVol[i+1]=ds.systemVol[i]*0.375f;
}
}
if (ds.system[i]==DIV_SYSTEM_ARCADE) {
@ -2200,6 +2204,21 @@ bool DivEngine::loadFur(unsigned char* file, size_t len) {
ds.autoSystem=true;
}
// system output config
if (ds.version>=135) {
for (int i=0; i<ds.systemLen; i++) {
ds.systemVol[i]=reader.readF();
ds.systemPan[i]=reader.readF();
ds.systemPanFR[i]=reader.readF();
}
// patchbay
unsigned int conns=reader.readI();
for (unsigned int i=0; i<conns; i++) {
ds.patchbay.push_back((unsigned int)reader.readI());
}
}
// read system flags
if (ds.version>=119) {
logD("reading chip flags...");
@ -4308,11 +4327,11 @@ SafeWriter* DivEngine::saveFur(bool notPrimary) {
}
for (int i=0; i<DIV_MAX_CHIPS; i++) {
w->writeC(song.systemVol[i]);
w->writeC(song.systemVol[i]*64.0f);
}
for (int i=0; i<DIV_MAX_CHIPS; i++) {
w->writeC(song.systemPan[i]);
w->writeC(song.systemPan[i]*127.0f);
}
// chip flags (we'll seek here later)
@ -4456,6 +4475,17 @@ SafeWriter* DivEngine::saveFur(bool notPrimary) {
w->writeString(song.systemNameJ,false);
w->writeString(song.categoryJ,false);
// system output config
for (int i=0; i<song.systemLen; i++) {
w->writeF(song.systemVol[i]);
w->writeF(song.systemPan[i]);
w->writeF(song.systemPanFR[i]);
}
w->writeI(song.patchbay.size());
for (unsigned int i: song.patchbay) {
w->writeI(i);
}
blockEndSeek=w->tell();
w->seek(blockStartSeek,SEEK_SET);
w->writeI(blockEndSeek-blockStartSeek-4);