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

Revert and Re-add instrument parameter into multipcm instruemnt

Browse source 
Fix per-channel OSC
This commit is contained in:
cam900 2024-07-13 07:34:53 +09:00
parent 339cc6a5f0
commit b1937b9834
10 changed files with 54 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/engine/instrument.cpp
View file

@ -174,12 +174,7 @@ bool DivInstrumentMultiPCM::operator==(const DivInstrumentMultiPCM& other) {
_C(rc) &&
_C(lfo) &&
_C(vib) &&
_C(am)
);
}
bool DivInstrumentOPL4PCM::operator==(const DivInstrumentOPL4PCM& other) {
return (
_C(am) &&
_C(damp) &&
_C(pseudoReverb) &&
_C(lfoReset) &&
@ -766,6 +761,11 @@ void DivInstrument::writeFeatureMP(SafeWriter* w) {
w->writeC(multipcm.vib);
w->writeC(multipcm.am);
w->writeC(multipcm.damp);
w->writeC(multipcm.pseudoReverb);
w->writeC(multipcm.lfoReset);
w->writeC(multipcm.levelDirect);
FEATURE_END;
}
@ -857,17 +857,6 @@ void DivInstrument::writeFeatureS2(SafeWriter* w) {
FEATURE_END;
}
void DivInstrument::writeFeatureO4(SafeWriter* w) {
FEATURE_BEGIN("O4");
w->writeC(opl4pcm.damp);
w->writeC(opl4pcm.pseudoReverb);
w->writeC(opl4pcm.lfoReset);
w->writeC(opl4pcm.levelDirect);
FEATURE_END;
}
void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bool insName) {
size_t blockStartSeek=0;
size_t blockEndSeek=0;
@ -914,7 +903,6 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
bool featureEF=false;
bool featurePN=false;
bool featureS2=false;
bool featureO4=false;
bool checkForWL=false;
@ -1158,12 +1146,6 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
feature64=true;
featureS2=true;
break;
case DIV_INS_OPL4PCM:
featureSM=true;
featureSL=true;
featureMP=true;
featureO4=true;
break;
case DIV_INS_MAX:
break;
case DIV_INS_NULL:
@ -1220,9 +1202,6 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
if (sid2!=defaultIns.sid2) {
featureS2=true;
}
if (opl4pcm!=defaultIns.opl4pcm) {
featureO4=true;
}
}
// check ins name
@ -1374,9 +1353,6 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
if (featureS2) {
writeFeatureS2(w);
}
if (featureO4) {
writeFeatureO4(w);
}
if (fui && (featureSL || featureWL)) {
w->write("EN",2);
@ -2098,6 +2074,11 @@ void DivInstrument::readFeatureMP(SafeReader& reader, short version) {
multipcm.vib=reader.readC();
multipcm.am=reader.readC();
multipcm.damp=reader.readC();
multipcm.pseudoReverb=reader.readC();
multipcm.lfoReset=reader.readC();
multipcm.levelDirect=reader.readC();
READ_FEAT_END;
}
@ -2205,16 +2186,6 @@ void DivInstrument::readFeatureS2(SafeReader& reader, short version) {
READ_FEAT_END;
}
void DivInstrument::readFeatureO4(SafeReader& reader, short version) {
READ_FEAT_BEGIN;
opl4pcm.damp=reader.readC();
opl4pcm.pseudoReverb=reader.readC();
opl4pcm.lfoReset=reader.readC();
opl4pcm.levelDirect=reader.readC();
READ_FEAT_END;
}
DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, bool fui, DivSong* song) {
unsigned char featCode[2];
@ -2290,8 +2261,6 @@ DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, b
readFeaturePN(reader,version);
} else if (memcmp(featCode,"S2",2)==0) { // SID2
readFeatureS2(reader,version);
} else if (memcmp(featCode,"O4",2)==0) { // OPL4 PCM
readFeatureO4(reader,version);
} else {
if (song==NULL && (memcmp(featCode,"SL",2)==0 || (memcmp(featCode,"WL",2)==0))) {
// nothing