etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sample_macro' of github.com:tildearrow/furnace into sample_macro

This commit is contained in:
tildearrow 2022-09-23 19:35:00 -05:00
parent bc4c8acd87 a5fb9b766e
commit e82374fcde
2 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/platform/msm6258.cpp
View File

@ -91,6 +91,7 @@ void DivPlatformMSM6258::acquire(short* bufL, short* bufR, size_t start, size_t
void DivPlatformMSM6258::tick(bool sysTick) {
for (int i=0; i<1; i++) {
if (!parent->song.disableSampleMacro) {
chan[i].std.next();
if (chan[i].std.duty.had) {
if (rateSel!=(chan[i].std.duty.val&3)) {
@ -115,6 +116,7 @@ void DivPlatformMSM6258::tick(bool sysTick) {
chan[i].keyOn=true;
}
}
}
if (chan[i].keyOn || chan[i].keyOff) {
samplePos=0;
rWrite(0,1); // turn off

3
src/engine/platform/msm6295.cpp
View File

@ -88,8 +88,8 @@ void DivPlatformMSM6295::acquire(short* bufL, short* bufR, size_t start, size_t
}
void DivPlatformMSM6295::tick(bool sysTick) {
if (parent->song.disableSampleMacro) return;
for (int i=0; i<4; i++) {
if (!parent->song.disableSampleMacro) {
chan[i].std.next();
if (chan[i].std.vol.had) {
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;
}
}
}
if (chan[i].keyOn || chan[i].keyOff) {
rWriteDelay(0,(8<<i),60); // turn off
if (chan[i].active && !chan[i].keyOff) {