Merge branch 'sample_macro' of github.com:tildearrow/furnace into sample_macro
This commit is contained in:
commit
e82374fcde
|
@ -91,6 +91,7 @@ void DivPlatformMSM6258::acquire(short* bufL, short* bufR, size_t start, size_t
|
||||||
|
|
||||||
void DivPlatformMSM6258::tick(bool sysTick) {
|
void DivPlatformMSM6258::tick(bool sysTick) {
|
||||||
for (int i=0; i<1; i++) {
|
for (int i=0; i<1; i++) {
|
||||||
|
if (!parent->song.disableSampleMacro) {
|
||||||
chan[i].std.next();
|
chan[i].std.next();
|
||||||
if (chan[i].std.duty.had) {
|
if (chan[i].std.duty.had) {
|
||||||
if (rateSel!=(chan[i].std.duty.val&3)) {
|
if (rateSel!=(chan[i].std.duty.val&3)) {
|
||||||
|
@ -115,6 +116,7 @@ void DivPlatformMSM6258::tick(bool sysTick) {
|
||||||
chan[i].keyOn=true;
|
chan[i].keyOn=true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (chan[i].keyOn || chan[i].keyOff) {
|
if (chan[i].keyOn || chan[i].keyOff) {
|
||||||
samplePos=0;
|
samplePos=0;
|
||||||
rWrite(0,1); // turn off
|
rWrite(0,1); // turn off
|
||||||
|
|
|
@ -88,8 +88,8 @@ void DivPlatformMSM6295::acquire(short* bufL, short* bufR, size_t start, size_t
|
||||||
}
|
}
|
||||||
|
|
||||||
void DivPlatformMSM6295::tick(bool sysTick) {
|
void DivPlatformMSM6295::tick(bool sysTick) {
|
||||||
if (parent->song.disableSampleMacro) return;
|
|
||||||
for (int i=0; i<4; i++) {
|
for (int i=0; i<4; i++) {
|
||||||
|
if (!parent->song.disableSampleMacro) {
|
||||||
chan[i].std.next();
|
chan[i].std.next();
|
||||||
if (chan[i].std.vol.had) {
|
if (chan[i].std.vol.had) {
|
||||||
chan[i].outVol=VOL_SCALE_LOG(chan[i].std.vol.val,chan[i].vol,8);
|
chan[i].outVol=VOL_SCALE_LOG(chan[i].std.vol.val,chan[i].vol,8);
|
||||||
|
@ -105,6 +105,7 @@ void DivPlatformMSM6295::tick(bool sysTick) {
|
||||||
chan[i].keyOn=true;
|
chan[i].keyOn=true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (chan[i].keyOn || chan[i].keyOff) {
|
if (chan[i].keyOn || chan[i].keyOff) {
|
||||||
rWriteDelay(0,(8<<i),60); // turn off
|
rWriteDelay(0,(8<<i),60); // turn off
|
||||||
if (chan[i].active && !chan[i].keyOff) {
|
if (chan[i].active && !chan[i].keyOff) {
|
||||||
|
|
Loading…
Reference in New Issue