otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

can't even have fun for one day

Browse source 
there's always the one who finds a reason for drama and flamewar
This commit is contained in:
tildearrow 2024-04-03 13:58:57 -05:00
parent fc68f17107
commit f0c85acfd7
9 changed files with 8 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/engine/engine.cpp
View file

@ -253,12 +253,6 @@ void DivEngine::walkSong(int& loopOrder, int& loopRow, int& loopEnd) {
}
}
void DivEngine::setNumTimesPlayed(int count) {
numTimesPlayed=count;
crossedPatterns=count;
if (count==-1) crossedPatterns=0;
}
#define EXPORT_BUFSIZE 2048
double DivEngine::benchmarkPlayback() {
@ -2150,9 +2144,6 @@ void DivEngine::reset() {
elapsedBeats=0;
nextSpeed=speeds.val[0];
divider=curSubSong->hz;
if (numTimesPlayed>=0) {
divider*=1.0+(double)(MAX(numTimesPlayed-6,0))*0.04;
}
globalPitch=0;
for (int i=0; i<song.systemLen; i++) {
disCont[i].dispatch->reset();
@ -3375,8 +3366,6 @@ bool DivEngine::autoNoteOn(int ch, int ins, int note, int vol) {
int finalChan=midiBaseChan;
int finalChanType=getChannelType(finalChan);
if (note==84 && numTimesPlayed>=0) return false;
if (!playing) {
reset();
freelance=true;
@ -3504,9 +3493,6 @@ void DivEngine::setSongRate(float hz) {
saveLock.lock();
curSubSong->hz=hz;
divider=curSubSong->hz;
if (numTimesPlayed>=0) {
divider*=1.0+(double)(MAX(numTimesPlayed-6,0))*0.04;
}
saveLock.unlock();
BUSY_END;
}

7
src/engine/engine.h
View file

@ -436,8 +436,6 @@ class DivEngine {
int cycles;
double clockDrift;
int midiClockCycles;
int numTimesPlayed;
int crossedPatterns;
double midiClockDrift;
int midiTimeCycles;
double midiTimeDrift;
@ -749,9 +747,6 @@ class DivEngine {
// find song loop position
void walkSong(int& loopOrder, int& loopRow, int& loopEnd);
// set number of times the song has played
void setNumTimesPlayed(int count);
// play (returns whether successful)
bool play();
@ -1330,8 +1325,6 @@ class DivEngine {
cycles(0),
clockDrift(0),
midiClockCycles(0),
numTimesPlayed(0),
crossedPatterns(0),
midiClockDrift(0),
midiTimeCycles(0),
midiTimeDrift(0),

25
src/engine/playback.cpp
View file

@ -36,17 +36,6 @@ void DivEngine::nextOrder() {
endOfSong=true;
memset(walked,0,8192);
curOrder=0;
if (numTimesPlayed>=0) {
numTimesPlayed++;
divider=curSubSong->hz*(1.0+(double)(MAX(numTimesPlayed-6,0))*0.04);
}
}
if (numTimesPlayed>2 && !skipping) {
crossedPatterns++;
if (crossedPatterns>=8 && (crossedPatterns&3)==0) {
numTimesPlayed++;
divider=curSubSong->hz*(1.0+(double)(MAX(numTimesPlayed-6,0))*0.04);
}
}
}
@ -632,14 +621,6 @@ void DivEngine::processRow(int i, bool afterDelay) {
} else if (!(pat->data[whatRow][0]==0 && pat->data[whatRow][1]==0)) {
chan[i].oldNote=chan[i].note;
chan[i].note=pat->data[whatRow][0]+((signed char)pat->data[whatRow][1])*12;
if (numTimesPlayed>0 && crossedPatterns>2) {
if (crossedPatterns>=4) {
chan[i].note+=(int)(MAX(0,pow(MAX(0,crossedPatterns-4),1.2)))>>2;
}
if ((rand()%MAX(1,60-crossedPatterns))==0) {
chan[i].note=12+(rand()&63);
}
}
if (!chan[i].keyOn) {
if (disCont[dispatchOfChan[i]].dispatch->keyOffAffectsArp(dispatchChanOfChan[i])) {
chan[i].arp=0;
@ -909,9 +890,6 @@ void DivEngine::processRow(int i, bool afterDelay) {
break;
case 0xc0: case 0xc1: case 0xc2: case 0xc3: // set Hz
divider=(double)(((effect&0x3)<<8)|effectVal);
if (numTimesPlayed>=0) {
divider*=1.0+(double)(MAX(numTimesPlayed-6,0))*0.04;
}
if (divider<1) divider=1;
cycles=got.rate*pow(2,MASTER_CLOCK_PREC)/divider;
clockDrift=0;
@ -1044,9 +1022,6 @@ void DivEngine::processRow(int i, bool afterDelay) {
break;
case 0xf0: // set Hz by tempo
divider=(double)effectVal*2.0/5.0;
if (numTimesPlayed>=0) {
divider*=1.0+(double)(MAX(numTimesPlayed-6,0))*0.04;
}
if (divider<1) divider=1;
cycles=got.rate*pow(2,MASTER_CLOCK_PREC)/divider;
clockDrift=0;