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

PowerNoise: add octave param

Browse source
This commit is contained in:
tildearrow 2024-01-25 12:37:18 -05:00
parent 9a6b5fb850
commit ef9a629d76
3 changed files with 54 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/engine/instrument.cpp
View file

@ -253,6 +253,10 @@ bool DivInstrumentESFM::Operator::operator==(const DivInstrumentESFM::Operator&
);
}
bool DivInstrumentPowerNoise::operator==(const DivInstrumentPowerNoise& other) {
return _C(octave);
}
#undef _C
#define FEATURE_BEGIN(x) \
@ -782,6 +786,14 @@ void DivInstrument::writeFeatureEF(SafeWriter* w) {
FEATURE_END;
}
void DivInstrument::writeFeaturePN(SafeWriter* w) {
FEATURE_BEGIN("PN");
w->writeC(powernoise.octave);
FEATURE_END;
}
void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bool insName) {
size_t blockStartSeek=0;
size_t blockEndSeek=0;
@ -826,6 +838,7 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
bool featureX1=false;
bool featureNE=false;
bool featureEF=false;
bool featurePN=false;
bool checkForWL=false;
@ -1044,8 +1057,10 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
featureEF=true;
break;
case DIV_INS_POWERNOISE:
featurePN=true;
break;
case DIV_INS_POWERNOISE_SLOPE:
featurePN=true;
break;
case DIV_INS_MAX:
break;
@ -1097,6 +1112,9 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
if (esfm!=defaultIns.esfm) {
featureEF=true;
}
if (powernoise!=defaultIns.powernoise) {
featurePN=true;
}
}
// check ins name
@ -1242,6 +1260,9 @@ void DivInstrument::putInsData2(SafeWriter* w, bool fui, const DivSong* song, bo
if (featureEF) {
writeFeatureEF(w);
}
if (featurePN) {
writeFeaturePN(w);
}
if (fui && (featureSL || featureWL)) {
w->write("EN",2);
@ -2677,6 +2698,14 @@ void DivInstrument::readFeatureEF(SafeReader& reader, short version) {
READ_FEAT_END;
}
void DivInstrument::readFeaturePN(SafeReader& reader, short version) {
READ_FEAT_BEGIN;
powernoise.octave=reader.readC();
READ_FEAT_END;
}
DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, bool fui, DivSong* song) {
unsigned char featCode[2];
bool volIsCutoff=false;
@ -2747,6 +2776,8 @@ DivDataErrors DivInstrument::readInsDataNew(SafeReader& reader, short version, b
readFeatureNE(reader,version);
} else if (memcmp(featCode,"EF",2)==0) { // ESFM
readFeatureEF(reader,version);
} else if (memcmp(featCode,"PN",2)==0) { // PowerNoise
readFeaturePN(reader,version);
} else {
if (song==NULL && (memcmp(featCode,"SL",2)==0 || (memcmp(featCode,"WL",2)==0))) {
// nothing