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

fix some macroInt issues with volume

This commit is contained in:
tildearrow 2023-03-17 18:16:04 -05:00
parent 69c3700ab4
commit d58270efed
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/engine/macroInt.cpp
View File

@ -20,6 +20,7 @@
#include "macroInt.h"
#include "instrument.h"
#include "engine.h"
#include "../ta-log.h"
#define ADSR_LOW source.val[0]
#define ADSR_HIGH source.val[1]
@ -52,6 +53,7 @@ void DivMacroStruct::doMacro(DivInstrumentMacro& source, bool released, bool tic
}
if (masked) {
had=false;
has=false;
return;
}
if (delay>0) {
@ -246,8 +248,10 @@ void DivMacroInt::setEngine(DivEngine* eng) {
}
#define ADD_MACRO(m,s) \
macroList[macroListLen]=&m; \
macroSource[macroListLen++]=&s;
if (!m.masked) { \
macroList[macroListLen]=&m; \
macroSource[macroListLen++]=&s; \
}
void DivMacroInt::init(DivInstrument* which) {
ins=which;

6
src/engine/platform/vic20.cpp
View File

@ -75,15 +75,13 @@ void DivPlatformVIC20::acquire(short** buf, size_t len) {
}
void DivPlatformVIC20::calcAndWriteOutVol(int ch, int env) {
logV("calcAndWriteOutVol (%d, %d)",ch,env);
chan[ch].outVol=MIN(chan[ch].vol*env/15,15);
writeOutVol(ch);
}
void DivPlatformVIC20::writeOutVol(int ch) {
if (chan[ch].active) {
logV("writeOutVol (%d): %d",ch,chan[ch].outVol);
rWrite(14,chan[ch].outVol);
}
rWrite(14,chan[ch].outVol);
}
void DivPlatformVIC20::tick(bool sysTick) {