minor fixes
This commit is contained in:
parent
c163f70983
commit
778d8d84d1
|
@ -27,8 +27,7 @@
|
||||||
#define MAX_CUSTOM_CLOCK 40000000
|
#define MAX_CUSTOM_CLOCK 40000000
|
||||||
|
|
||||||
// common shared channel struct
|
// common shared channel struct
|
||||||
template<typename T>
|
template<typename T> struct SharedChannel {
|
||||||
struct SharedChannel {
|
|
||||||
int freq, baseFreq, pitch, pitch2;
|
int freq, baseFreq, pitch, pitch2;
|
||||||
int ins, note;
|
int ins, note;
|
||||||
bool active, insChanged, freqChanged, keyOn, keyOff, portaPause, inPorta;
|
bool active, insChanged, freqChanged, keyOn, keyOff, portaPause, inPorta;
|
||||||
|
|
|
@ -27,15 +27,13 @@ class DivPlatformMMC5: public DivDispatch {
|
||||||
int prevFreq;
|
int prevFreq;
|
||||||
unsigned char duty, sweep;
|
unsigned char duty, sweep;
|
||||||
bool sweepChanged, furnaceDac;
|
bool sweepChanged, furnaceDac;
|
||||||
signed short wave;
|
|
||||||
Channel():
|
Channel():
|
||||||
SharedChannel<signed char>(15),
|
SharedChannel<signed char>(15),
|
||||||
prevFreq(65535),
|
prevFreq(65535),
|
||||||
duty(0),
|
duty(0),
|
||||||
sweep(8),
|
sweep(8),
|
||||||
sweepChanged(false),
|
sweepChanged(false),
|
||||||
furnaceDac(false),
|
furnaceDac(false) {}
|
||||||
wave(-1) {}
|
|
||||||
};
|
};
|
||||||
Channel chan[5];
|
Channel chan[5];
|
||||||
DivDispatchOscBuffer* oscBuf[3];
|
DivDispatchOscBuffer* oscBuf[3];
|
||||||
|
|
|
@ -91,7 +91,8 @@ class DivPlatformMSM6295: public DivDispatch, public vgsound_emu_mem_intf {
|
||||||
|
|
||||||
virtual int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags) override;
|
virtual int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags) override;
|
||||||
virtual void quit() override;
|
virtual void quit() override;
|
||||||
DivPlatformMSM6295():DivDispatch(),
|
DivPlatformMSM6295():
|
||||||
|
DivDispatch(),
|
||||||
vgsound_emu_mem_intf(),
|
vgsound_emu_mem_intf(),
|
||||||
msm(*this) {}
|
msm(*this) {}
|
||||||
~DivPlatformMSM6295();
|
~DivPlatformMSM6295();
|
||||||
|
|
|
@ -29,7 +29,6 @@ class DivPlatformNES: public DivDispatch {
|
||||||
int prevFreq;
|
int prevFreq;
|
||||||
unsigned char duty, sweep, envMode, len;
|
unsigned char duty, sweep, envMode, len;
|
||||||
bool sweepChanged, furnaceDac;
|
bool sweepChanged, furnaceDac;
|
||||||
signed short wave;
|
|
||||||
Channel():
|
Channel():
|
||||||
SharedChannel<signed char>(15),
|
SharedChannel<signed char>(15),
|
||||||
prevFreq(65535),
|
prevFreq(65535),
|
||||||
|
@ -38,8 +37,7 @@ class DivPlatformNES: public DivDispatch {
|
||||||
envMode(3),
|
envMode(3),
|
||||||
len(0x1f),
|
len(0x1f),
|
||||||
sweepChanged(false),
|
sweepChanged(false),
|
||||||
furnaceDac(false),
|
furnaceDac(false) {}
|
||||||
wave(-1) {}
|
|
||||||
};
|
};
|
||||||
Channel chan[5];
|
Channel chan[5];
|
||||||
DivDispatchOscBuffer* oscBuf[5];
|
DivDispatchOscBuffer* oscBuf[5];
|
||||||
|
|
Loading…
Reference in a new issue