Sync with master
This commit is contained in:
parent
2b7b227539
commit
5ff3d910ca
|
|
@ -26,15 +26,14 @@
|
||||||
#include "vgsound_emu/src/k007232/k007232.hpp"
|
#include "vgsound_emu/src/k007232/k007232.hpp"
|
||||||
|
|
||||||
class DivPlatformK007232: public DivDispatch, public k007232_intf {
|
class DivPlatformK007232: public DivDispatch, public k007232_intf {
|
||||||
struct Channel {
|
struct Channel: public SharedChannelFreq, public SharedChannelVolume<int> {
|
||||||
int freq, prevFreq, baseFreq, pitch, pitch2;
|
int prevFreq;
|
||||||
unsigned int audPos;
|
unsigned int audPos;
|
||||||
int prevBank;
|
int prevBank;
|
||||||
int sample, wave, ins;
|
int sample;
|
||||||
int note;
|
|
||||||
int panning, prevPan;
|
int panning, prevPan;
|
||||||
bool active, insChanged, volumeChanged, freqChanged, keyOn, keyOff, inPorta, setPos;
|
bool volumeChanged, setPos;
|
||||||
int vol, outVol, resVol, lvol, rvol;
|
int resVol, lvol, rvol;
|
||||||
int macroVolMul;
|
int macroVolMul;
|
||||||
DivMacroInt std;
|
DivMacroInt std;
|
||||||
void macroInit(DivInstrument* which) {
|
void macroInit(DivInstrument* which) {
|
||||||
|
|
@ -42,28 +41,16 @@ class DivPlatformK007232: public DivDispatch, public k007232_intf {
|
||||||
pitch2=0;
|
pitch2=0;
|
||||||
}
|
}
|
||||||
Channel():
|
Channel():
|
||||||
freq(0),
|
SharedChannelFreq(),
|
||||||
|
SharedChannelVolume<int>(15),
|
||||||
prevFreq(-1),
|
prevFreq(-1),
|
||||||
baseFreq(0),
|
|
||||||
pitch(0),
|
|
||||||
pitch2(0),
|
|
||||||
audPos(0),
|
audPos(0),
|
||||||
prevBank(-1),
|
prevBank(-1),
|
||||||
sample(-1),
|
sample(-1),
|
||||||
ins(-1),
|
|
||||||
note(0),
|
|
||||||
panning(255),
|
panning(255),
|
||||||
prevPan(-1),
|
prevPan(-1),
|
||||||
active(false),
|
|
||||||
insChanged(true),
|
|
||||||
volumeChanged(false),
|
volumeChanged(false),
|
||||||
freqChanged(false),
|
|
||||||
keyOn(false),
|
|
||||||
keyOff(false),
|
|
||||||
inPorta(false),
|
|
||||||
setPos(false),
|
setPos(false),
|
||||||
vol(15),
|
|
||||||
outVol(15),
|
|
||||||
resVol(15),
|
resVol(15),
|
||||||
lvol(15),
|
lvol(15),
|
||||||
rvol(15),
|
rvol(15),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue