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

SID3 docs, part 3

Browse source 
also fix wave mix mode saving and remove unneeded lfsr taps save
This commit is contained in:
LTVA1 2024-08-17 22:30:54 +03:00
parent a99bea5c59
commit 91b08aaeb4
3 changed files with 81 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/engine/instrument.cpp
View file

@ -258,7 +258,6 @@ bool DivInstrumentESFM::Operator::operator==(const DivInstrumentESFM::Operator&
bool DivInstrumentSID3::operator==(const DivInstrumentSID3& other) {
return (
_C(sr) &&
_C(lfsr_taps) &&
_C(phase_mod) &&
_C(phase_mod_source) &&
_C(ring_mod_source) &&
@ -904,6 +903,8 @@ void DivInstrument::writeFeatureS3(SafeWriter* w) {
w->writeC(sid3.sr);
w->writeC(c64.r);
w->writeC(sid2.mixMode);
w->writeC(
(sid3.phase_mod?0x80:0)|
(sid3.specialWaveOn?0x40:0)|
@ -912,7 +913,6 @@ void DivInstrument::writeFeatureS3(SafeWriter* w) {
(sid3.doWavetable?8:0)
);
w->writeI(sid3.lfsr_taps);
w->writeC(sid3.phase_mod_source);
w->writeC(sid3.ring_mod_source);
w->writeC(sid3.sync_source);
@ -2320,7 +2320,12 @@ void DivInstrument::readFeatureS2(SafeReader& reader, short version) {
unsigned char next=reader.readC();
sid2.volume=next&0xf;
sid2.mixMode=(next>>4)&3;
if(type != DIV_INS_SID3)
{
sid2.mixMode=(next>>4)&3;
}
sid2.noiseMode=next>>6;
READ_FEAT_END;
@ -2335,6 +2340,8 @@ void DivInstrument::readFeatureS3(SafeReader& reader, short version) {
sid3.sr=reader.readC();
c64.r=reader.readC();
sid2.mixMode=reader.readC();
unsigned char next = reader.readC();
sid3.phase_mod = next&0x80;
@ -2343,7 +2350,6 @@ void DivInstrument::readFeatureS3(SafeReader& reader, short version) {
sid3.separateNoisePitch = next&0x10;
sid3.doWavetable = next&8;
sid3.lfsr_taps = reader.readI();
sid3.phase_mod_source = reader.readC();
sid3.ring_mod_source = reader.readC();
sid3.sync_source = reader.readC();

2
src/engine/instrument.h
View file

@ -865,7 +865,6 @@ struct DivInstrumentSID2 {
struct DivInstrumentSID3
{
unsigned char sr;
unsigned int lfsr_taps;
bool phase_mod;
unsigned char phase_mod_source, ring_mod_source, sync_source;
bool specialWaveOn;
@ -935,7 +934,6 @@ struct DivInstrumentSID3
}
DivInstrumentSID3():
sr(0),
lfsr_taps(0),
phase_mod(false),
phase_mod_source(0),
ring_mod_source(0),