Sync with master
This commit is contained in:
parent
105e863a53
commit
1c4138dcff
|
@ -33,7 +33,7 @@ template<typename T> struct SharedChannel {
|
||||||
bool active, insChanged, freqChanged, keyOn, keyOff, portaPause, inPorta;
|
bool active, insChanged, freqChanged, keyOn, keyOff, portaPause, inPorta;
|
||||||
T vol, outVol;
|
T vol, outVol;
|
||||||
DivMacroInt std;
|
DivMacroInt std;
|
||||||
void macroInit(DivInstrument* which) {
|
virtual void macroInit(DivInstrument* which) {
|
||||||
std.init(which);
|
std.init(which);
|
||||||
pitch2=0;
|
pitch2=0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include "vgsound_emu/src/es550x/es5506.hpp"
|
#include "vgsound_emu/src/es550x/es5506.hpp"
|
||||||
|
|
||||||
class DivPlatformES5506: public DivDispatch, public es550x_intf {
|
class DivPlatformES5506: public DivDispatch, public es550x_intf {
|
||||||
struct Channel : public SharedChannelFreq, public SharedChannelVolume<unsigned int> {
|
struct Channel : public SharedChannel<unsigned int> {
|
||||||
struct PCM {
|
struct PCM {
|
||||||
bool isNoteMap;
|
bool isNoteMap;
|
||||||
int index, next;
|
int index, next;
|
||||||
|
@ -183,10 +183,8 @@ class DivPlatformES5506: public DivDispatch, public es550x_intf {
|
||||||
signed int oscOut;
|
signed int oscOut;
|
||||||
DivInstrumentES5506::Filter filter;
|
DivInstrumentES5506::Filter filter;
|
||||||
DivInstrumentES5506::Envelope envelope;
|
DivInstrumentES5506::Envelope envelope;
|
||||||
DivMacroInt std;
|
virtual void macroInit(DivInstrument* which) override {
|
||||||
void macroInit(DivInstrument* which) {
|
SharedChannel<unsigned int>::macroInit(which);
|
||||||
std.init(which);
|
|
||||||
pitch2=0;
|
|
||||||
if (std.ex1.mode==2) {
|
if (std.ex1.mode==2) {
|
||||||
k1Offs=0;
|
k1Offs=0;
|
||||||
}
|
}
|
||||||
|
@ -197,8 +195,7 @@ class DivPlatformES5506: public DivDispatch, public es550x_intf {
|
||||||
k2Prev=0xffff;
|
k2Prev=0xffff;
|
||||||
}
|
}
|
||||||
Channel():
|
Channel():
|
||||||
SharedChannelFreq(),
|
SharedChannel<unsigned int>(0xff),
|
||||||
SharedChannelVolume<unsigned int>(0xff),
|
|
||||||
pcm(PCM()),
|
pcm(PCM()),
|
||||||
nextFreq(0),
|
nextFreq(0),
|
||||||
nextNote(0),
|
nextNote(0),
|
||||||
|
|
Loading…
Reference in New Issue