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

earliest multi-chip support 

no saving, no adding chips yet...
only the beginning
This commit is contained in:
tildearrow 2022-01-08 17:15:12 -05:00
parent 7080434ed4
commit 06c7ac92a2
6 changed files with 129 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/engine/dispatchContainer.cpp
View File

@ -17,6 +17,32 @@ void DivDispatchContainer::setRates(double gotRate) {
blip_set_rates(bb[1],dispatch->rate,gotRate);
}
void DivDispatchContainer::acquire(size_t offset, size_t count) {
dispatch->acquire(bbIn[0],bbIn[1],offset,count);
}
void DivDispatchContainer::fillBuf(size_t runtotal, size_t size) {
for (size_t i=0; i<runtotal; i++) {
temp[0]=bbIn[0][i];
blip_add_delta(bb[0],i,temp[0]-prevSample[0]);
prevSample[0]=temp[0];
}
if (dispatch->isStereo()) for (size_t i=0; i<runtotal; i++) {
temp[1]=bbIn[1][i];
blip_add_delta(bb[1],i,temp[1]-prevSample[1]);
prevSample[1]=temp[1];
}
blip_end_frame(bb[0],runtotal);
blip_read_samples(bb[0],bbOut[0],size,0);
if (dispatch->isStereo()) {
blip_end_frame(bb[1],runtotal);
blip_read_samples(bb[1],bbOut[1],size,0);
}
}
void DivDispatchContainer::clear() {
blip_clear(bb[0]);
blip_clear(bb[1]);

32
src/engine/engine.cpp
View File

@ -1940,7 +1940,7 @@ void DivEngine::addOrder(bool duplicate, bool where) {
if (song.ordersLen>=0x7e) return;
isBusy.lock();
if (duplicate) {
for (int i=0; i<32; i++) {
for (int i=0; i<DIV_MAX_CHANS; i++) {
order[i]=song.orders.ord[i][curOrder];
}
} else {
@ -1960,12 +1960,12 @@ void DivEngine::addOrder(bool duplicate, bool where) {
}
}
if (where) { // at the end
for (int i=0; i<32; i++) {
for (int i=0; i<DIV_MAX_CHANS; i++) {
song.orders.ord[i][song.ordersLen]=order[i];
}
song.ordersLen++;
} else { // after current order
for (int i=0; i<32; i++) {
for (int i=0; i<DIV_MAX_CHANS; i++) {
for (int j=song.ordersLen; j>curOrder; j--) {
song.orders.ord[i][j]=song.orders.ord[i][j-1];
}
@ -1983,7 +1983,7 @@ void DivEngine::addOrder(bool duplicate, bool where) {
void DivEngine::deleteOrder() {
if (song.ordersLen<=1) return;
isBusy.lock();
for (int i=0; i<32; i++) {
for (int i=0; i<DIV_MAX_CHANS; i++) {
for (int j=curOrder; j<song.ordersLen; j++) {
song.orders.ord[i][j]=song.orders.ord[i][j+1];
}
@ -2002,7 +2002,7 @@ void DivEngine::moveOrderUp() {
isBusy.unlock();
return;
}
for (int i=0; i<32; i++) {
for (int i=0; i<DIV_MAX_CHANS; i++) {
song.orders.ord[i][curOrder]^=song.orders.ord[i][curOrder-1];
song.orders.ord[i][curOrder-1]^=song.orders.ord[i][curOrder];
song.orders.ord[i][curOrder]^=song.orders.ord[i][curOrder-1];
@ -2020,7 +2020,7 @@ void DivEngine::moveOrderDown() {
isBusy.unlock();
return;
}
for (int i=0; i<32; i++) {
for (int i=0; i<DIV_MAX_CHANS; i++) {
song.orders.ord[i][curOrder]^=song.orders.ord[i][curOrder+1];
song.orders.ord[i][curOrder+1]^=song.orders.ord[i][curOrder];
song.orders.ord[i][curOrder]^=song.orders.ord[i][curOrder+1];
@ -2278,15 +2278,17 @@ bool DivEngine::init(String outName) {
while (remainingLoops) {
nextBuf(NULL,NULL,0,2,got.bufsize);
if (dispatch->isStereo()) {
for (size_t i=0; i<got.bufsize; i++) {
ilBuffer[i<<1]=bbOut[0][i];
ilBuffer[1+(i<<1)]=bbOut[1][i];
}
} else {
for (size_t i=0; i<got.bufsize; i++) {
ilBuffer[i<<1]=bbOut[0][i];
ilBuffer[1+(i<<1)]=bbOut[0][i];
for (int h=0; h<song.systemLen; h++) {
if (disCont[h].dispatch->isStereo()) {
for (size_t i=0; i<got.bufsize; i++) {
ilBuffer[i<<1]=disCont[h].bbOut[0][i];
ilBuffer[1+(i<<1)]=disCont[h].bbOut[1][i];
}
} else {
for (size_t i=0; i<got.bufsize; i++) {
ilBuffer[i<<1]=disCont[h].bbOut[0][i];
ilBuffer[1+(i<<1)]=disCont[h].bbOut[0][i];
}
}
}

2
src/engine/engine.h
View File

@ -94,6 +94,8 @@ struct DivDispatchContainer {
int cycles, clockDrift;
void setRates(double gotRate);
void acquire(size_t offset, size_t count);
void fillBuf(size_t runtotal, size_t size);
void clear();
void init(DivSystem sys, DivEngine* eng, int chanCount, double gotRate, bool pal);
void quit();

161
src/engine/playback.cpp
View File

@ -711,7 +711,7 @@ bool DivEngine::nextTick(bool noAccum) {
}
for (int i=0; i<song.systemLen; i++) {
DivDispatchContainer& dc=dispatch[i];
DivDispatchContainer& dc=disCont[i];
dc.cycles=dc.dispatch->rate/divider;
dc.clockDrift+=dc.dispatch->rate%divider;
if (dc.clockDrift>=divider) {
@ -858,26 +858,26 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
isBusy.lock();
if (out!=NULL && sPreview.sample>=0 && sPreview.sample<(int)song.sample.size()) {
DivSample* s=song.sample[sPreview.sample];
size_t prevtotal=blip_clocks_needed(bb[2],size);
size_t prevtotal=blip_clocks_needed(samp_bb,size);
for (size_t i=0; i<prevtotal; i++) {
if (sPreview.pos>=s->rendLength) {
temp[2]=0;
samp_temp=0;
} else {
temp[2]=s->rendData[sPreview.pos++];
samp_temp=s->rendData[sPreview.pos++];
}
if (s->depth==8) temp[2]<<=8;
blip_add_delta(bb[2],i,temp[2]-prevSample[2]);
prevSample[2]=temp[2];
if (s->depth==8) samp_temp<<=8;
blip_add_delta(samp_bb,i,samp_temp-samp_prevSample);
samp_prevSample=samp_temp;
}
if (sPreview.pos>=s->rendLength) sPreview.sample=-1;
blip_end_frame(bb[2],prevtotal);
blip_read_samples(bb[2],bbOut[2],size,0);
blip_end_frame(samp_bb,prevtotal);
blip_read_samples(samp_bb,samp_bbOut,size,0);
for (size_t i=0; i<size; i++) {
out[0][i]+=(float)bbOut[2][i]/32768.0;
out[1][i]+=(float)bbOut[2][i]/32768.0;
out[0][i]+=(float)samp_bbOut[i]/32768.0;
out[1][i]+=(float)samp_bbOut[i]/32768.0;
}
}
@ -887,14 +887,20 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
}
// logic starts here
size_t runtotal=blip_clocks_needed(bb[0],size);
if (runtotal>bbInLen) {
delete bbIn[0];
delete bbIn[1];
bbIn[0]=new short[runtotal+256];
bbIn[1]=new short[runtotal+256];
bbInLen=runtotal+256;
size_t runtotal[32];
size_t runLeft[32];
size_t runPos[32];
for (int i=0; i<song.systemLen; i++) {
runtotal[i]=blip_clocks_needed(disCont[i].bb[0],size);
if (runtotal[i]>disCont[i].bbInLen) {
delete disCont[i].bbIn[0];
delete disCont[i].bbIn[1];
disCont[i].bbIn[0]=new short[runtotal[i]+256];
disCont[i].bbIn[1]=new short[runtotal[i]+256];
disCont[i].bbInLen=runtotal[i]+256;
}
runLeft[i]=runtotal[i];
runPos[i]=0;
}
if (metroTickLen<size) {
@ -905,61 +911,58 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
memset(metroTick,0,size);
size_t runLeft=runtotal;
size_t runPos=0;
totalProcessed=0;
while (runLeft) {
if (!remainingLoops) {
memset(bbIn[0]+runPos,0,runLeft*sizeof(short));
memset(bbIn[1]+runPos,0,runLeft*sizeof(short));
break;
} else {
if ((int)runLeft>=cycles) {
runLeft-=cycles;
dispatch->acquire(bbIn[0],bbIn[1],runPos,cycles);
runPos+=cycles;
unsigned int realPos=(runPos*size)/runtotal;
if (realPos>=size) realPos=size-1;
if (song.hilightA>0) {
if ((curRow%song.hilightA)==0 && ticks==1) metroTick[realPos]=1;
}
if (song.hilightB>0) {
if ((curRow%song.hilightB)==0 && ticks==1) metroTick[realPos]=2;
}
if (nextTick()) {
if (remainingLoops>0) {
remainingLoops--;
if (!remainingLoops) logI("end of song!\n");
}
}
} else {
dispatch->acquire(bbIn[0],bbIn[1],runPos,runLeft);
cycles-=runLeft;
runPos=runtotal;
while (true) {
bool allDone=true;
bool getOut=true;
// 1. check whether we are done with all buffers
for (int i=0; i<song.systemLen; i++) {
if (runLeft[i]>0) {
getOut=false;
break;
}
}
if (getOut) break;
// 2. check whether we gonna tick
for (int i=0; i<song.systemLen; i++) {
if (disCont[i].cycles>0) {
allDone=false;
break;
}
}
if (allDone) {
// we have to tick
unsigned int realPos=(runPos[0]*size)/runtotal[0];
if (realPos>=size) realPos=size-1;
if (song.hilightA>0) {
if ((curRow%song.hilightA)==0 && ticks==1) metroTick[realPos]=1;
}
if (song.hilightB>0) {
if ((curRow%song.hilightB)==0 && ticks==1) metroTick[realPos]=2;
}
if (nextTick()) {
if (remainingLoops>0) {
remainingLoops--;
if (!remainingLoops) logI("end of song!\n");
}
}
}
// 3. fill buffers as needed
for (int i=0; i<song.systemLen; i++) {
if (runLeft[i]<=0) continue;
int total=runLeft[i];
if (total>disCont[i].cycles) total=disCont[i].cycles;
runLeft[i]-=total;
disCont[i].cycles-=total;
disCont[i].acquire(runPos[i],total);
runPos[i]+=total;
}
}
totalProcessed=(1+runPos)*got.rate/dispatch->rate;
totalProcessed=(1+runPos[0])*got.rate/disCont[0].dispatch->rate;
for (size_t i=0; i<runtotal; i++) {
temp[0]=bbIn[0][i];
blip_add_delta(bb[0],i,temp[0]-prevSample[0]);
prevSample[0]=temp[0];
}
if (dispatch->isStereo()) for (size_t i=0; i<runtotal; i++) {
temp[1]=bbIn[1][i];
blip_add_delta(bb[1],i,temp[1]-prevSample[1]);
prevSample[1]=temp[1];
}
blip_end_frame(bb[0],runtotal);
blip_read_samples(bb[0],bbOut[0],size,0);
if (dispatch->isStereo()) {
blip_end_frame(bb[1],runtotal);
blip_read_samples(bb[1],bbOut[1],size,0);
for (int i=0; i<song.systemLen; i++) {
disCont[i].fillBuf(runtotal[i],size);
}
if (out==NULL) {
@ -967,15 +970,17 @@ void DivEngine::nextBuf(float** in, float** out, int inChans, int outChans, unsi
return;
}
if (dispatch->isStereo()) {
for (size_t i=0; i<size; i++) {
out[0][i]+=(float)bbOut[0][i]/16384.0;
out[1][i]+=(float)bbOut[1][i]/16384.0;
}
} else {
for (size_t i=0; i<size; i++) {
out[0][i]+=(float)bbOut[0][i]/16384.0;
out[1][i]+=(float)bbOut[0][i]/16384.0;
for (int i=0; i<song.systemLen; i++) {
if (disCont[i].dispatch->isStereo()) {
for (size_t j=0; j<size; j++) {
out[0][j]+=(float)disCont[i].bbOut[0][j]/16384.0;
out[1][j]+=(float)disCont[i].bbOut[1][j]/16384.0;
}
} else {
for (size_t j=0; j<size; j++) {
out[0][j]+=(float)disCont[i].bbOut[0][j]/16384.0;
out[1][j]+=(float)disCont[i].bbOut[0][j]/16384.0;
}
}
}

3
src/gui/gui.cpp
View File

@ -1742,7 +1742,7 @@ void FurnaceGUI::makeUndo(ActionType action) {
s.nibble=curNibble;
switch (action) {
case GUI_ACTION_CHANGE_ORDER:
for (int i=0; i<32; i++) {
for (int i=0; i<DIV_MAX_CHANS; i++) {
for (int j=0; j<128; j++) {
if (oldOrders.ord[i][j]!=e->song.orders.ord[i][j]) {
s.ord.push_back(UndoOrderData(i,j,oldOrders.ord[i][j],e->song.orders.ord[i][j]));
@ -3076,7 +3076,6 @@ FurnaceGUI::FurnaceGUI():
macroDragActive(false),
nextScroll(-1.0f),
nextAddScroll(0.0f),
oldSystem(DIV_SYSTEM_NULL),
oldOrdersLen(0) {
uiColors[GUI_COLOR_BACKGROUND]=ImVec4(0.1f,0.1f,0.1f,1.0f);
uiColors[GUI_COLOR_FRAME_BACKGROUND]=ImVec4(0.0f,0.0f,0.0f,0.85f);

2
src/gui/gui.h
View File

@ -123,7 +123,6 @@ struct UndoStep {
SelectionPoint cursor, selStart, selEnd;
int order;
bool nibble;
DivSystem oldSystem, newSystem;
int oldOrdersLen, newOrdersLen;
int oldPatLen, newPatLen;
std::vector<UndoOrderData> ord;
@ -202,7 +201,6 @@ class FurnaceGUI {
ImVec2 patWindowPos, patWindowSize;
DivSystem oldSystem;
int oldOrdersLen;
DivOrders oldOrders;
DivPattern* oldPat[128];