a lot of master system fixes!
fixes forest frolick, professional tracker, YZYX, Monday (kinda), MasterTracker and Ice Fields
This commit is contained in:
parent
3e34c60b32
commit
dc5990a37e
|
@ -165,6 +165,20 @@ class DivDispatch {
|
||||||
*/
|
*/
|
||||||
virtual bool keyOffAffectsArp(int ch);
|
virtual bool keyOffAffectsArp(int ch);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* test whether sending a key off command to a channel should reset slides too.
|
||||||
|
* @param ch the channel in question.
|
||||||
|
* @return whether it does.
|
||||||
|
*/
|
||||||
|
virtual bool keyOffAffectsPorta(int ch);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get the lowest note in a portamento.
|
||||||
|
* @param ch the channel in question.
|
||||||
|
* @return the lowest note.
|
||||||
|
*/
|
||||||
|
virtual int getPortaFloor(int ch);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* set the region to PAL.
|
* set the region to PAL.
|
||||||
* @param pal whether to set it to PAL.
|
* @param pal whether to set it to PAL.
|
||||||
|
|
|
@ -1565,6 +1565,7 @@ void DivEngine::reset() {
|
||||||
extValuePresent=0;
|
extValuePresent=0;
|
||||||
speed1=song.speed1;
|
speed1=song.speed1;
|
||||||
speed2=song.speed2;
|
speed2=song.speed2;
|
||||||
|
nextSpeed=speed1;
|
||||||
globalPitch=0;
|
globalPitch=0;
|
||||||
dispatch->reset();
|
dispatch->reset();
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,6 +31,14 @@ bool DivDispatch::keyOffAffectsArp(int ch) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool DivDispatch::keyOffAffectsPorta(int ch) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
int DivDispatch::getPortaFloor(int ch) {
|
||||||
|
return 0x00;
|
||||||
|
}
|
||||||
|
|
||||||
void DivDispatch::setPAL(bool pal) {
|
void DivDispatch::setPAL(bool pal) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -419,6 +419,10 @@ bool DivPlatformGenesis::keyOffAffectsArp(int ch) {
|
||||||
return (ch>5);
|
return (ch>5);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool DivPlatformGenesis::keyOffAffectsPorta(int ch) {
|
||||||
|
return (ch>5);
|
||||||
|
}
|
||||||
|
|
||||||
void DivPlatformGenesis::setPAL(bool pal) {
|
void DivPlatformGenesis::setPAL(bool pal) {
|
||||||
if (pal) {
|
if (pal) {
|
||||||
rate=211125;
|
rate=211125;
|
||||||
|
|
|
@ -58,6 +58,7 @@ class DivPlatformGenesis: public DivDispatch {
|
||||||
void muteChannel(int ch, bool mute);
|
void muteChannel(int ch, bool mute);
|
||||||
bool isStereo();
|
bool isStereo();
|
||||||
bool keyOffAffectsArp(int ch);
|
bool keyOffAffectsArp(int ch);
|
||||||
|
bool keyOffAffectsPorta(int ch);
|
||||||
void setPAL(bool pal);
|
void setPAL(bool pal);
|
||||||
int init(DivEngine* parent, int channels, int sugRate, bool pal);
|
int init(DivEngine* parent, int channels, int sugRate, bool pal);
|
||||||
void quit();
|
void quit();
|
||||||
|
|
|
@ -306,6 +306,10 @@ bool DivPlatformGenesisExt::keyOffAffectsArp(int ch) {
|
||||||
return (ch>8);
|
return (ch>8);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool DivPlatformGenesisExt::keyOffAffectsPorta(int ch) {
|
||||||
|
return (ch>8);
|
||||||
|
}
|
||||||
|
|
||||||
int DivPlatformGenesisExt::init(DivEngine* parent, int channels, int sugRate, bool pal) {
|
int DivPlatformGenesisExt::init(DivEngine* parent, int channels, int sugRate, bool pal) {
|
||||||
DivPlatformGenesis::init(parent,channels,sugRate,pal);
|
DivPlatformGenesis::init(parent,channels,sugRate,pal);
|
||||||
for (int i=0; i<4; i++) {
|
for (int i=0; i<4; i++) {
|
||||||
|
|
|
@ -22,6 +22,7 @@ class DivPlatformGenesisExt: public DivPlatformGenesis {
|
||||||
void tick();
|
void tick();
|
||||||
void muteChannel(int ch, bool mute);
|
void muteChannel(int ch, bool mute);
|
||||||
bool keyOffAffectsArp(int ch);
|
bool keyOffAffectsArp(int ch);
|
||||||
|
bool keyOffAffectsPorta(int ch);
|
||||||
int init(DivEngine* parent, int channels, int sugRate, bool pal);
|
int init(DivEngine* parent, int channels, int sugRate, bool pal);
|
||||||
void quit();
|
void quit();
|
||||||
~DivPlatformGenesisExt();
|
~DivPlatformGenesisExt();
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
#include "../engine.h"
|
#include "../engine.h"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
|
#define FREQ_BASE 1712.0f
|
||||||
|
|
||||||
void DivPlatformSMS::acquire(short* bufL, short* bufR, size_t start, size_t len) {
|
void DivPlatformSMS::acquire(short* bufL, short* bufR, size_t start, size_t len) {
|
||||||
sn->sound_stream_update(bufL+start,len);
|
sn->sound_stream_update(bufL+start,len);
|
||||||
}
|
}
|
||||||
|
@ -21,14 +23,19 @@ void DivPlatformSMS::tick() {
|
||||||
}
|
}
|
||||||
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.0f)));
|
chan[i].baseFreq=round(FREQ_BASE/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(FREQ_BASE/pow(2.0f,((float)(chan[i].note+chan[i].std.arp-12)/12.0f)));
|
||||||
}
|
}
|
||||||
chan[i].freqChanged=true;
|
chan[i].freqChanged=true;
|
||||||
|
} else {
|
||||||
|
if (chan[i].std.arpMode && chan[i].std.finishedArp) {
|
||||||
|
chan[i].baseFreq=round(FREQ_BASE/pow(2.0f,((float)(chan[i].note)/12.0f)));
|
||||||
|
chan[i].freqChanged=true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (chan[i].std.hadDuty) {
|
if (i==3) if (chan[i].std.hadDuty) {
|
||||||
snNoiseMode=(snNoiseMode&2)|(chan[i].std.duty&1);
|
snNoiseMode=chan[i].std.duty;
|
||||||
if (chan[i].std.duty<2) {
|
if (chan[i].std.duty<2) {
|
||||||
chan[3].freqChanged=false;
|
chan[3].freqChanged=false;
|
||||||
}
|
}
|
||||||
|
@ -46,7 +53,8 @@ void DivPlatformSMS::tick() {
|
||||||
}
|
}
|
||||||
if (chan[3].freqChanged || updateSNMode) {
|
if (chan[3].freqChanged || updateSNMode) {
|
||||||
updateSNMode=false;
|
updateSNMode=false;
|
||||||
chan[3].freq=parent->calcFreq(chan[3].baseFreq,chan[3].pitch,true);
|
// seems arbitrary huh?
|
||||||
|
chan[3].freq=parent->calcFreq(chan[3].baseFreq,chan[3].pitch-1,true);
|
||||||
if (chan[3].note>0x5d) chan[3].freq=0x01;
|
if (chan[3].note>0x5d) chan[3].freq=0x01;
|
||||||
chan[3].freqChanged=false;
|
chan[3].freqChanged=false;
|
||||||
if (snNoiseMode&2) { // take period from channel 3
|
if (snNoiseMode&2) { // take period from channel 3
|
||||||
|
@ -80,7 +88,7 @@ void DivPlatformSMS::tick() {
|
||||||
int DivPlatformSMS::dispatch(DivCommand c) {
|
int DivPlatformSMS::dispatch(DivCommand c) {
|
||||||
switch (c.cmd) {
|
switch (c.cmd) {
|
||||||
case DIV_CMD_NOTE_ON:
|
case DIV_CMD_NOTE_ON:
|
||||||
chan[c.chan].baseFreq=round(1712.0f/pow(2.0f,((float)c.value/12.0f)));
|
chan[c.chan].baseFreq=round(FREQ_BASE/pow(2.0f,((float)c.value/12.0f)));
|
||||||
chan[c.chan].freqChanged=true;
|
chan[c.chan].freqChanged=true;
|
||||||
chan[c.chan].note=c.value;
|
chan[c.chan].note=c.value;
|
||||||
chan[c.chan].active=true;
|
chan[c.chan].active=true;
|
||||||
|
@ -116,7 +124,7 @@ int DivPlatformSMS::dispatch(DivCommand c) {
|
||||||
chan[c.chan].freqChanged=true;
|
chan[c.chan].freqChanged=true;
|
||||||
break;
|
break;
|
||||||
case DIV_CMD_NOTE_PORTA: {
|
case DIV_CMD_NOTE_PORTA: {
|
||||||
int destFreq=round(1712.0f/pow(2.0f,((float)c.value2/12.0f)));
|
int destFreq=round(FREQ_BASE/pow(2.0f,((float)c.value2/12.0f)));
|
||||||
bool return2=false;
|
bool return2=false;
|
||||||
if (destFreq>chan[c.chan].baseFreq) {
|
if (destFreq>chan[c.chan].baseFreq) {
|
||||||
chan[c.chan].baseFreq+=c.value;
|
chan[c.chan].baseFreq+=c.value;
|
||||||
|
@ -140,7 +148,7 @@ int DivPlatformSMS::dispatch(DivCommand c) {
|
||||||
updateSNMode=true;
|
updateSNMode=true;
|
||||||
break;
|
break;
|
||||||
case DIV_CMD_LEGATO:
|
case DIV_CMD_LEGATO:
|
||||||
chan[c.chan].baseFreq=round(1712.0f/pow(2.0f,((float)(c.value+((chan[c.chan].std.willArp && !chan[c.chan].std.arpMode)?(chan[c.chan].std.arp-12):(0)))/12.0f)));
|
chan[c.chan].baseFreq=round(FREQ_BASE/pow(2.0f,((float)(c.value+((chan[c.chan].std.willArp && !chan[c.chan].std.arpMode)?(chan[c.chan].std.arp-12):(0)))/12.0f)));
|
||||||
chan[c.chan].freqChanged=true;
|
chan[c.chan].freqChanged=true;
|
||||||
chan[c.chan].note=c.value;
|
chan[c.chan].note=c.value;
|
||||||
break;
|
break;
|
||||||
|
@ -177,6 +185,14 @@ bool DivPlatformSMS::keyOffAffectsArp(int ch) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool DivPlatformSMS::keyOffAffectsPorta(int ch) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
int DivPlatformSMS::getPortaFloor(int ch) {
|
||||||
|
return 12;
|
||||||
|
}
|
||||||
|
|
||||||
void DivPlatformSMS::setPAL(bool pal) {
|
void DivPlatformSMS::setPAL(bool pal) {
|
||||||
if (pal) {
|
if (pal) {
|
||||||
rate=221681;
|
rate=221681;
|
||||||
|
|
|
@ -39,6 +39,8 @@ class DivPlatformSMS: public DivDispatch {
|
||||||
void tick();
|
void tick();
|
||||||
void muteChannel(int ch, bool mute);
|
void muteChannel(int ch, bool mute);
|
||||||
bool keyOffAffectsArp(int ch);
|
bool keyOffAffectsArp(int ch);
|
||||||
|
bool keyOffAffectsPorta(int ch);
|
||||||
|
int getPortaFloor(int ch);
|
||||||
void setPAL(bool pal);
|
void setPAL(bool pal);
|
||||||
int init(DivEngine* parent, int channels, int sugRate, bool pal);
|
int init(DivEngine* parent, int channels, int sugRate, bool pal);
|
||||||
void quit();
|
void quit();
|
||||||
|
|
|
@ -347,6 +347,14 @@ void DivEngine::processRow(int i, bool afterDelay) {
|
||||||
chan[i].portaSpeed=-1;
|
chan[i].portaSpeed=-1;
|
||||||
chan[i].stopOnOff=false;
|
chan[i].stopOnOff=false;
|
||||||
}
|
}
|
||||||
|
if (dispatch->keyOffAffectsPorta(i)) {
|
||||||
|
chan[i].portaNote=-1;
|
||||||
|
chan[i].portaSpeed=-1;
|
||||||
|
if (i==2 && song.system==DIV_SYSTEM_SMS) {
|
||||||
|
chan[i+1].portaNote=-1;
|
||||||
|
chan[i+1].portaSpeed=-1;
|
||||||
|
}
|
||||||
|
}
|
||||||
dispatchCmd(DivCommand(DIV_CMD_NOTE_OFF,i));
|
dispatchCmd(DivCommand(DIV_CMD_NOTE_OFF,i));
|
||||||
} else if (!(pat->data[whatRow][0]==0 && pat->data[whatRow][1]==0)) {
|
} else if (!(pat->data[whatRow][0]==0 && pat->data[whatRow][1]==0)) {
|
||||||
chan[i].oldNote=chan[i].note;
|
chan[i].oldNote=chan[i].note;
|
||||||
|
@ -419,7 +427,7 @@ void DivEngine::processRow(int i, bool afterDelay) {
|
||||||
chan[i].portaSpeed=-1;
|
chan[i].portaSpeed=-1;
|
||||||
chan[i].inPorta=false;
|
chan[i].inPorta=false;
|
||||||
} else {
|
} else {
|
||||||
chan[i].portaNote=0x00;
|
chan[i].portaNote=dispatch->getPortaFloor(i);
|
||||||
chan[i].portaSpeed=effectVal;
|
chan[i].portaSpeed=effectVal;
|
||||||
chan[i].portaStop=true;
|
chan[i].portaStop=true;
|
||||||
chan[i].nowYouCanStop=false;
|
chan[i].nowYouCanStop=false;
|
||||||
|
@ -467,11 +475,12 @@ void DivEngine::processRow(int i, bool afterDelay) {
|
||||||
chan[i].arp=effectVal;
|
chan[i].arp=effectVal;
|
||||||
break;
|
break;
|
||||||
case 0x0c: // retrigger
|
case 0x0c: // retrigger
|
||||||
chan[i].rowDelay=effectVal+1;
|
if (effectVal!=0) {
|
||||||
chan[i].delayOrder=whatOrder;
|
chan[i].rowDelay=effectVal; // this was +1 before. what happened?!
|
||||||
chan[i].delayRow=whatRow;
|
chan[i].delayOrder=whatOrder;
|
||||||
|
chan[i].delayRow=whatRow;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 0xe0: // arp speed
|
case 0xe0: // arp speed
|
||||||
song.arpLen=effectVal;
|
song.arpLen=effectVal;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue