Sync with master
This commit is contained in:
parent
441ad05484
commit
ad6fd1561f
|
@ -26,7 +26,7 @@
|
||||||
#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: public SharedChannelFreq, public SharedChannelVolume<int> {
|
struct Channel: public SharedChannel<int> {
|
||||||
int prevFreq;
|
int prevFreq;
|
||||||
unsigned int audPos;
|
unsigned int audPos;
|
||||||
int prevBank;
|
int prevBank;
|
||||||
|
@ -35,14 +35,8 @@ class DivPlatformK007232: public DivDispatch, public k007232_intf {
|
||||||
bool volumeChanged, setPos;
|
bool volumeChanged, setPos;
|
||||||
int resVol, lvol, rvol;
|
int resVol, lvol, rvol;
|
||||||
int macroVolMul;
|
int macroVolMul;
|
||||||
DivMacroInt std;
|
|
||||||
void macroInit(DivInstrument* which) {
|
|
||||||
std.init(which);
|
|
||||||
pitch2=0;
|
|
||||||
}
|
|
||||||
Channel():
|
Channel():
|
||||||
SharedChannelFreq(),
|
SharedChannel<int>(15),
|
||||||
SharedChannelVolume<int>(15),
|
|
||||||
prevFreq(-1),
|
prevFreq(-1),
|
||||||
audPos(0),
|
audPos(0),
|
||||||
prevBank(-1),
|
prevBank(-1),
|
||||||
|
|
Loading…
Reference in a new issue