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

prepare to implement stuff in cmd stream

Browse source 
vol slide with target, tremolo, panbrello and pan slide
This commit is contained in:
tildearrow 2025-04-05 04:33:46 -05:00
parent a49664a3f5
commit 110562c2c4
6 changed files with 80 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/engine/cmdStream.cpp
View file

@ -117,6 +117,8 @@ bool DivCSPlayer::tick() {
case 0xb8: case 0xbe: case 0xc0: case 0xc2:
case 0xc3: case 0xc4: case 0xc5: case 0xc6:
case 0xc7: case 0xc8: case 0xc9: case 0xca:
case 0xcb: case 0xcc: case 0xcd: case 0xce:
case 0xcf:
command=next-0xb4;
break;
case 0xf0: // placeholder
@ -147,19 +149,11 @@ bool DivCSPlayer::tick() {
command=stream.readC();
break;
case 0xf8: {
unsigned int callAddr=chan[i].readPos+2+stream.readS();
unsigned int callAddr=(unsigned short)stream.readS();
chan[i].readPos=stream.tell();
if (!chan[i].doCall(callAddr)) {
logE("%d: (callb16) stack error!",i);
}
mustTell=false;
break;
}
case 0xf6: {
unsigned int callAddr=chan[i].readPos+4+stream.readI();
chan[i].readPos=stream.tell();
if (!chan[i].doCall(callAddr)) {
logE("%d: (callb32) stack error!",i);
logE("%d: (call) stack error!",i);
chan[i].readPos=0;
}
mustTell=false;
break;
@ -168,7 +162,8 @@ bool DivCSPlayer::tick() {
unsigned int callAddr=stream.readI();
chan[i].readPos=stream.tell();
if (!chan[i].doCall(callAddr)) {
logE("%d: (call) stack error!",i);
logE("%d: (calli) stack error!",i);
chan[i].readPos=0;
}
mustTell=false;
break;
@ -208,9 +203,9 @@ bool DivCSPlayer::tick() {
chan[i].lastWaitLen=chan[i].waitTicks;
break;
case 0xff:
chan[i].readPos=chan[i].startPos;
chan[i].readPos=0;
mustTell=false;
logI("%d: stop go back to %x",i,chan[i].readPos);
logI("%d: stop",i,chan[i].readPos);
break;
default:
logE("%d: illegal instruction $%.2x! $%.x",i,next,chan[i].readPos);
@ -240,7 +235,7 @@ bool DivCSPlayer::tick() {
arg0=(signed char)stream.readC();
arg1=(unsigned char)stream.readC();
break;
case DIV_CMD_PANNING:
case DIV_CMD_HINT_PANNING: // TODO: panbrello
arg0=(unsigned char)stream.readC();
arg1=(unsigned char)stream.readC();
break;
@ -391,6 +386,9 @@ bool DivCSPlayer::tick() {
case DIV_CMD_HINT_ARP_TIME:
arpSpeed=arg0;
break;
case DIV_CMD_HINT_PANNING:
e->dispatchCmd(DivCommand(DIV_CMD_PANNING,i,arg0,arg1));
break;
default: // dispatch it
e->dispatchCmd(DivCommand((DivDispatchCmds)command,i,arg0,arg1));
break;

142
src/engine/cmdStreamOps.cpp
View file

@ -34,7 +34,7 @@ int DivCS::getInsLength(unsigned char ins, unsigned char ext) {
case 0xca: // legato
case 0xfd: // waitc
return 2;
case 0xbe: // pan
case 0xcf: // pan
case 0xc2: // vibrato
case 0xc6: // arpeggio
case 0xc8: // vol slide
@ -48,20 +48,19 @@ int DivCS::getInsLength(unsigned char ins, unsigned char ext) {
return 0;
case 0xf0: // opt
return 4;
case 0xf2: // opt command
case 0xf7: { // cmd
// determine length from secondary
if (ext==0) return 0;
return 0;
}
case 0xf8: // callb16
case 0xf8: // call
case 0xfc: // waits
return 3;
case 0xf4: // callsym
case 0xf5: // call
case 0xf6: // callb32
case 0xf5: // calli
case 0xfa: // jmp
case 0xfb: // rate
case 0xcb: // volporta
return 5;
}
return 1;
@ -80,7 +79,6 @@ void writePackedCommandValues(SafeWriter* w, const DivCommand& c) {
case DIV_CMD_NOTE_OFF_ENV:
case DIV_CMD_ENV_RELEASE:
case DIV_CMD_INSTRUMENT:
case DIV_CMD_PANNING:
case DIV_CMD_PRE_PORTA:
case DIV_CMD_HINT_VIBRATO:
case DIV_CMD_HINT_VIBRATO_RANGE:
@ -92,11 +90,15 @@ void writePackedCommandValues(SafeWriter* w, const DivCommand& c) {
case DIV_CMD_HINT_VOL_SLIDE:
case DIV_CMD_HINT_VOL_SLIDE_TARGET:
case DIV_CMD_HINT_LEGATO:
case DIV_CMD_HINT_TREMOLO:
case DIV_CMD_HINT_PANBRELLO:
case DIV_CMD_HINT_PAN_SLIDE:
case DIV_CMD_HINT_PANNING:
w->writeC((unsigned char)c.cmd+0xb4);
break;
default:
return; // quit for now... we'll implement this later
w->writeC(0xf2); // unoptimized extended command
return;
w->writeC(0xf7);
w->writeC(c.cmd);
break;
}
@ -118,9 +120,12 @@ void writePackedCommandValues(SafeWriter* w, const DivCommand& c) {
case DIV_CMD_HINT_VIBRATO_SHAPE:
case DIV_CMD_HINT_PITCH:
case DIV_CMD_HINT_VOLUME:
case DIV_CMD_HINT_TREMOLO:
case DIV_CMD_HINT_PANBRELLO:
case DIV_CMD_HINT_PAN_SLIDE:
w->writeC(c.value);
break;
case DIV_CMD_PANNING:
case DIV_CMD_HINT_PANNING:
case DIV_CMD_HINT_VIBRATO:
case DIV_CMD_HINT_ARPEGGIO:
case DIV_CMD_HINT_PORTA:
@ -536,15 +541,11 @@ SafeWriter* DivEngine::saveCommand() {
switch (i.cmd) {
// strip away hinted/useless commands
case DIV_CMD_GET_VOLUME:
break;
case DIV_CMD_VOLUME:
break;
case DIV_CMD_PANNING:
case DIV_CMD_NOTE_PORTA:
break;
case DIV_CMD_LEGATO:
break;
case DIV_CMD_PITCH:
break;
case DIV_CMD_PRE_NOTE:
break;
default:
@ -808,119 +809,6 @@ SafeWriter* DivEngine::saveCommand() {
sortPos++;
}*/
/*
for (int i=0; i<chans; i++) {
// optimize stream
SafeWriter* oldStream=chanStream[i];
SafeReader* reader=oldStream->toReader();
chanStream[i]=new SafeWriter;
chanStream[i]->init();
while (1) {
try {
unsigned char next=reader->readC();
switch (next) {
case 0xb8: // instrument
case 0xc0: // pre porta
case 0xc3: // vibrato range
case 0xc4: // vibrato shape
case 0xc5: // pitch
case 0xc7: // volume
case 0xca: // legato
chanStream[i]->writeC(next);
next=reader->readC();
chanStream[i]->writeC(next);
break;
case 0xbe: // panning
case 0xc2: // vibrato
case 0xc6: // arpeggio
case 0xc8: // vol slide
case 0xc9: // porta
chanStream[i]->writeC(next);
next=reader->readC();
chanStream[i]->writeC(next);
next=reader->readC();
chanStream[i]->writeC(next);
break;
case 0xf2: { // full command (pre)
unsigned char cmd=reader->readC();
bool foundShort=false;
for (int j=0; j<16; j++) {
if (sortedCmd[j]==cmd) {
chanStream[i]->writeC(0xd0+j);
foundShort=true;
break;
}
}
if (!foundShort) {
chanStream[i]->writeC(0xf7); // full command
chanStream[i]->writeC(cmd);
}
unsigned char cmdLen=reader->readC();
logD("cmdLen: %d",cmdLen);
for (unsigned char j=0; j<cmdLen; j++) {
next=reader->readC();
chanStream[i]->writeC(next);
}
break;
}
case 0xfb: // tick rate
chanStream[i]->writeC(next);
next=reader->readC();
chanStream[i]->writeC(next);
next=reader->readC();
chanStream[i]->writeC(next);
next=reader->readC();
chanStream[i]->writeC(next);
next=reader->readC();
chanStream[i]->writeC(next);
break;
case 0xfc: { // 16-bit wait
unsigned short delay=reader->readS();
bool foundShort=false;
for (int j=0; j<16; j++) {
if (sortedDelay[j]==delay) {
chanStream[i]->writeC(0xe0+j);
foundShort=true;
break;
}
}
if (!foundShort) {
chanStream[i]->writeC(next);
chanStream[i]->writeS(delay);
}
break;
}
case 0xfd: { // 8-bit wait
unsigned char delay=reader->readC();
bool foundShort=false;
for (int j=0; j<16; j++) {
if (sortedDelay[j]==delay) {
chanStream[i]->writeC(0xe0+j);
foundShort=true;
break;
}
}
if (!foundShort) {
chanStream[i]->writeC(next);
chanStream[i]->writeC(delay);
}
break;
}
default:
chanStream[i]->writeC(next);
break;
}
} catch (EndOfFileException& e) {
break;
}
}
oldStream->finish();
delete oldStream;
}*/
// write results
for (int i=0; i<chans; i++) {
chanStreamOff[i]=w->tell();

4
src/engine/dispatch.h
View file

@ -71,6 +71,10 @@ enum DivDispatchCmds {
DIV_CMD_HINT_PORTA, // (target, speed)
DIV_CMD_HINT_LEGATO, // (note)
DIV_CMD_HINT_VOL_SLIDE_TARGET, // (amount, target)
DIV_CMD_HINT_TREMOLO, // (speed/depth as a byte)
DIV_CMD_HINT_PANBRELLO, // (speed/depth as a byte)
DIV_CMD_HINT_PAN_SLIDE, // (speed)
DIV_CMD_HINT_PANNING, // (left, right)
DIV_CMD_SAMPLE_MODE, // (enabled)
DIV_CMD_SAMPLE_FREQ, // (frequency)

8
src/engine/playback.cpp
View file

@ -68,6 +68,10 @@ const char* cmdName[]={
"HINT_PORTA",
"HINT_LEGATO",
"HINT_VOL_SLIDE_TARGET",
"HINT_TREMOLO",
"HINT_PANBRELLO",
"HINT_PAN_SLIDE",
"HINT_PANNING",
"SAMPLE_MODE",
"SAMPLE_FREQ",
@ -764,6 +768,7 @@ void DivEngine::processRow(int i, bool afterDelay) {
} else {
chan[i].panSpeed=0;
}
dispatchCmd(DivCommand(DIV_CMD_HINT_PAN_SLIDE,i,chan[i].panSpeed&0xff));
break;
case 0x84: // panbrello
if (chan[i].panDepth==0) {
@ -774,6 +779,7 @@ void DivEngine::processRow(int i, bool afterDelay) {
if (chan[i].panDepth!=0) {
chan[i].panSpeed=0;
}
dispatchCmd(DivCommand(DIV_CMD_HINT_PANBRELLO,i,effectVal));
break;
case 0x88: // panning rear (split 4-bit)
chan[i].panRL=(effectVal>>4)|(effectVal&0xf0);
@ -941,6 +947,7 @@ void DivEngine::processRow(int i, bool afterDelay) {
}
chan[i].tremoloDepth=effectVal&15;
chan[i].tremoloRate=effectVal>>4;
dispatchCmd(DivCommand(DIV_CMD_HINT_TREMOLO,i,effectVal));
if (chan[i].tremoloDepth!=0) {
chan[i].volSpeed=0;
chan[i].volSpeedTarget=-1;
@ -1229,6 +1236,7 @@ void DivEngine::processRow(int i, bool afterDelay) {
if (panChanged) {
dispatchCmd(DivCommand(DIV_CMD_PANNING,i,chan[i].panL,chan[i].panR));
dispatchCmd(DivCommand(DIV_CMD_HINT_PANNING,i,chan[i].panL,chan[i].panR));
}
if (surroundPanChanged) {
dispatchCmd(DivCommand(DIV_CMD_SURROUND_PANNING,i,2,chan[i].panRL));