are you kidding me?
This commit is contained in:
parent
bbd175e8f6
commit
0caaa1629c
|
@ -6,7 +6,7 @@ void DivMacroInt::next() {
|
||||||
hadVol=hasVol;
|
hadVol=hasVol;
|
||||||
if (hasVol) {
|
if (hasVol) {
|
||||||
vol=ins->std.volMacro[volPos++];
|
vol=ins->std.volMacro[volPos++];
|
||||||
if (volPos>=ins->std.volMacroLen) {
|
if (volPos>=ins->std.volMacroLen && ins->std.volMacroLoop<ins->std.volMacroLen) {
|
||||||
if (ins->std.volMacroLoop>=0) {
|
if (ins->std.volMacroLoop>=0) {
|
||||||
volPos=ins->std.volMacroLoop;
|
volPos=ins->std.volMacroLoop;
|
||||||
} else {
|
} else {
|
||||||
|
@ -19,7 +19,7 @@ void DivMacroInt::next() {
|
||||||
if (hasArp) {
|
if (hasArp) {
|
||||||
arp=ins->std.arpMacro[arpPos++];
|
arp=ins->std.arpMacro[arpPos++];
|
||||||
if (arpPos>=ins->std.arpMacroLen) {
|
if (arpPos>=ins->std.arpMacroLen) {
|
||||||
if (ins->std.arpMacroLoop>=0) {
|
if (ins->std.arpMacroLoop>=0 && ins->std.arpMacroLoop<ins->std.arpMacroLen) {
|
||||||
arpPos=ins->std.arpMacroLoop;
|
arpPos=ins->std.arpMacroLoop;
|
||||||
} else {
|
} else {
|
||||||
hasArp=false;
|
hasArp=false;
|
||||||
|
@ -30,7 +30,7 @@ void DivMacroInt::next() {
|
||||||
hadDuty=hasDuty;
|
hadDuty=hasDuty;
|
||||||
if (hasDuty) {
|
if (hasDuty) {
|
||||||
duty=ins->std.dutyMacro[dutyPos++];
|
duty=ins->std.dutyMacro[dutyPos++];
|
||||||
if (dutyPos>=ins->std.dutyMacroLen) {
|
if (dutyPos>=ins->std.dutyMacroLen && ins->std.dutyMacroLoop<ins->std.dutyMacroLen) {
|
||||||
if (ins->std.dutyMacroLoop>=0) {
|
if (ins->std.dutyMacroLoop>=0) {
|
||||||
dutyPos=ins->std.dutyMacroLoop;
|
dutyPos=ins->std.dutyMacroLoop;
|
||||||
} else {
|
} else {
|
||||||
|
@ -42,7 +42,7 @@ void DivMacroInt::next() {
|
||||||
hadWave=hasWave;
|
hadWave=hasWave;
|
||||||
if (hasWave) {
|
if (hasWave) {
|
||||||
wave=ins->std.waveMacro[wavePos++];
|
wave=ins->std.waveMacro[wavePos++];
|
||||||
if (wavePos>=ins->std.waveMacroLen) {
|
if (wavePos>=ins->std.waveMacroLen && ins->std.waveMacroLoop<ins->std.waveMacroLen) {
|
||||||
if (ins->std.waveMacroLoop>=0) {
|
if (ins->std.waveMacroLoop>=0) {
|
||||||
wavePos=ins->std.waveMacroLoop;
|
wavePos=ins->std.waveMacroLoop;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
#include "dummy.h"
|
#include "dummy.h"
|
||||||
|
#include <stdio.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
void DivPlatformDummy::acquire(int& l, int& r) {
|
void DivPlatformDummy::acquire(int& l, int& r) {
|
||||||
|
@ -16,6 +17,7 @@ void DivPlatformDummy::tick() {
|
||||||
}
|
}
|
||||||
|
|
||||||
int DivPlatformDummy::dispatch(DivCommand c) {
|
int DivPlatformDummy::dispatch(DivCommand c) {
|
||||||
|
printf("command: %d %d %d %d\n",c.cmd,c.chan,c.value,c.value2);
|
||||||
switch (c.cmd) {
|
switch (c.cmd) {
|
||||||
case DIV_CMD_NOTE_ON:
|
case DIV_CMD_NOTE_ON:
|
||||||
chan[c.chan].freq=16.4f*pow(2.0f,((float)c.value/12.0f));
|
chan[c.chan].freq=16.4f*pow(2.0f,((float)c.value/12.0f));
|
||||||
|
|
|
@ -15,7 +15,7 @@ void DivPlatformSMS::tick() {
|
||||||
if (chan[i].std.hadVol) sn->write(0x90|(i<<5)|(15-((chan[i].vol*chan[i].std.vol)>>4)));
|
if (chan[i].std.hadVol) sn->write(0x90|(i<<5)|(15-((chan[i].vol*chan[i].std.vol)>>4)));
|
||||||
if (chan[i].std.hadArp) {
|
if (chan[i].std.hadArp) {
|
||||||
if (chan[i].std.arpMode) {
|
if (chan[i].std.arpMode) {
|
||||||
chan[i].baseFreq=round(1712.0f/pow(2.0f,((float)(chan[i].std.arp-12)/12.0f)));
|
chan[i].baseFreq=round(1712.0f/pow(2.0f,((float)(chan[i].std.arp)/12.0f)));
|
||||||
} else {
|
} else {
|
||||||
chan[i].baseFreq=round(1712.0f/pow(2.0f,((float)(chan[i].note+chan[i].std.arp-12)/12.0f)));
|
chan[i].baseFreq=round(1712.0f/pow(2.0f,((float)(chan[i].note+chan[i].std.arp-12)/12.0f)));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue