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

OPL: key off after 4-op mode change

Browse source 
somehow fixes issue #2171
This commit is contained in:
tildearrow 2024-09-25 14:24:39 -05:00
parent b2c1f8d919
commit f7412e5234
2 changed files with 35 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/engine/fileOps/ftm.cpp
View file

@ -268,11 +268,9 @@ int convertMacrosSID[5] = {(int)DIV_MACRO_VOL, (int)DIV_MACRO_ARP, (int)DIV_MACR
int convert_vrc6_duties[4] = {1, 3, 7, 3}; int convert_vrc6_duties[4] = {1, 3, 7, 3};
int findEmptyFx(short* data) int findEmptyFx(short* data) {
{ for (int i=0; i<7; i++) {
for(int i = 0; i < 7; i++) if (data[4+i*2]==-1) return i;
{
if(data[4 + i*2] == -1) return i;
} }
return -1; return -1;
} }
@ -2456,27 +2454,27 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
for (int l = 0; l < ds.subsong[j]->patLen; l++) { for (int l = 0; l < ds.subsong[j]->patLen; l++) {
if (ds.subsong[j]->pat[ii].data[k]->data[l][4 + 7*2] == -666) { if (ds.subsong[j]->pat[ii].data[k]->data[l][4 + 7*2] == -666) {
bool converted = false; bool converted = false;
for(int hh = 0; hh < 7; hh++) { // for()? if()? THESE ARE NOT FUNCTIONS!
if(ds.subsong[j]->pat[ii].data[k]->data[l][4 + hh*2] == 0x22 && !converted) { for (int hh = 0; hh < 7; hh++) { // oh and now you 1TBS up. oh man...
if (ds.subsong[j]->pat[ii].data[k]->data[l][4 + hh*2] == 0x22 && !converted) {
int slot = findEmptyFx(ds.subsong[j]->pat[ii].data[k]->data[l]); int slot = findEmptyFx(ds.subsong[j]->pat[ii].data[k]->data[l]);
if(slot != -1) { if (slot != -1) {
//Hxy - Envelope automatic pitch // space your comments damn it!
// Hxy - Envelope automatic pitch
//Sets envelope period to the note period shifted by x and envelope type y. // Sets envelope period to the note period shifted by x and envelope type y.
//Approximate envelope frequency is note frequency * (2^|x - 8|) / 32. // Approximate envelope frequency is note frequency * (2^|x - 8|) / 32.
int ftAutoEnv = (ds.subsong[j]->pat[ii].data[k]->data[l][5 + hh*2] >> 4) & 15; int ftAutoEnv = (ds.subsong[j]->pat[ii].data[k]->data[l][5 + hh*2] >> 4) & 15;
int autoEnvDen = 16; // ???? with 32 it's an octave lower... int autoEnvDen = 16; // ???? with 32 it's an octave lower...
int autoEnvNum = (1 << (abs(ftAutoEnv - 8))); int autoEnvNum = (1 << (abs(ftAutoEnv - 8)));
while(autoEnvNum >= 2 && autoEnvDen >= 2) while (autoEnvNum >= 2 && autoEnvDen >= 2) {
{
autoEnvDen /= 2; autoEnvDen /= 2;
autoEnvNum /= 2; autoEnvNum /= 2;
} }
if(autoEnvDen < 16 && autoEnvNum < 16) if (autoEnvDen < 16 && autoEnvNum < 16) {
{
ds.subsong[j]->pat[ii].data[k]->data[l][4 + slot*2] = 0x29; ds.subsong[j]->pat[ii].data[k]->data[l][4 + slot*2] = 0x29;
ds.subsong[j]->pat[ii].data[k]->data[l][5 + slot*2] = (autoEnvNum << 4) | autoEnvDen; ds.subsong[j]->pat[ii].data[k]->data[l][5 + slot*2] = (autoEnvNum << 4) | autoEnvDen;
} }
@ -2495,23 +2493,19 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
} }
} }
for (size_t j = 0; j < ds.subsong.size(); j++) { //open hidden effect columns for (size_t j = 0; j < ds.subsong.size(); j++) { // open hidden effect columns
// what are your rules for spacing, really?
DivSubSong* s = ds.subsong[j]; DivSubSong* s = ds.subsong[j];
for(int c = 0; c < total_chans; c++) for (int c = 0; c < total_chans; c++) {
{
int num_fx = 1; int num_fx = 1;
for(int p = 0; p < s->ordersLen; p++) for (int p = 0; p < s->ordersLen; p++) {
{ for (int r = 0; r < s->patLen; r++) {
for(int r = 0; r < s->patLen; r++)
{
DivPattern* pat = s->pat[c].getPattern(s->orders.ord[c][p], true); DivPattern* pat = s->pat[c].getPattern(s->orders.ord[c][p], true);
short* s_row_data = pat->data[r]; short* s_row_data = pat->data[r];
for(int eff = 0; eff < DIV_MAX_EFFECTS - 1; eff++) for (int eff = 0; eff < DIV_MAX_EFFECTS - 1; eff++) {
{ if (s_row_data[4 + 2 * eff] != -1 && eff + 1 > num_fx) {
if(s_row_data[4 + 2 * eff] != -1 && eff + 1 > num_fx)
{
num_fx = eff + 1; num_fx = eff + 1;
} }
} }
@ -2528,24 +2522,11 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
// actually, this is wrong. Furnace is very lax regarding instrument usage. you can put an OPM instrument in OPL channel and yeah, it'll sound weird but it'll work. - tildearrow // actually, this is wrong. Furnace is very lax regarding instrument usage. you can put an OPM instrument in OPL channel and yeah, it'll sound weird but it'll work. - tildearrow
// I don't trust you
// where did you get that assumption from? did you make it up?
// first you go "I don't trust you" on me and then you drop this. couldn't
// you at least look around a bit?!
// since when do 2A03 and VRC6 duties match? who said that they do?
// Furnace wasn't designed to automatically convert duties of wrong instrument types, damn it!
// on top of that, you didn't have to drop this. AT ALL.
// instrument conversion is simpler than eating with a fork. you just copy the
// instruments and DON'T FORGET TO CONVERT DUTY MACROS (!!), than adapt VRC6 sawtooth volume and that's it.
// really? were these simplifications in import necessary? it isn't a new compat flag, after all.
// oh man....
// P.S. Duties conversion is based on what I really hear in FamiTracker when using wrong instrument type (and what I see on Audacity "oscilloscope") - LTVA // P.S. Duties conversion is based on what I really hear in FamiTracker when using wrong instrument type (and what I see on Audacity "oscilloscope") - LTVA
// is that the best you could do? paste my rant from that other commit and change a couple words?
// at least be creative next time...
int ins_vrc6_conv[256][2]; int ins_vrc6_conv[256][2];
int ins_vrc6_saw_conv[256][2]; int ins_vrc6_saw_conv[256][2];
int ins_nes_conv[256][2]; // vrc6 (or whatever) -> nes int ins_nes_conv[256][2]; // vrc6 (or whatever) -> nes
@ -2570,13 +2551,12 @@ bool DivEngine::loadFTM(unsigned char* file, size_t len, bool dnft, bool dnft_si
if (ds.subsong[j]->pat[ii].data[k] == NULL) if (ds.subsong[j]->pat[ii].data[k] == NULL)
continue; continue;
for (int l = 0; l < ds.subsong[j]->patLen; l++) { for (int l = 0; l < ds.subsong[j]->patLen; l++) {
if (ds.subsong[j]->pat[ii].data[k]->data[l][2] == i) // instrument // 1TBS > GNU
{ if (ds.subsong[j]->pat[ii].data[k]->data[l][2] == i) { // instrument
DivInstrument* ins = ds.ins[i]; DivInstrument* ins = ds.ins[i];
bool go_to_end = false; bool go_to_end = false;
if (ins->type != DIV_INS_VRC6 && (ii == vrc6_chans[0] || ii == vrc6_chans[1])) // we encountered non-VRC6 instrument on VRC6 channel if (ins->type != DIV_INS_VRC6 && (ii == vrc6_chans[0] || ii == vrc6_chans[1])) { // we encountered non-VRC6 instrument on VRC6 channel
{
DivInstrument* insnew = new DivInstrument; DivInstrument* insnew = new DivInstrument;
ds.ins.push_back(insnew); ds.ins.push_back(insnew);

18
src/engine/platform/opl.cpp
View file

@ -1218,6 +1218,15 @@ void DivPlatformOPL::tick(bool sysTick) {
memset(weWillWriteRRLater,0,64*sizeof(bool)); memset(weWillWriteRRLater,0,64*sizeof(bool));
if (update4OpMask) {
update4OpMask=false;
if (oplType==3) {
unsigned char opMask=(int)(chan[0].fourOp)|(chan[2].fourOp<<1)|(chan[4].fourOp<<2)|(chan[6].fourOp<<3)|(chan[8].fourOp<<4)|(chan[10].fourOp<<5);
immWrite(0x104,opMask);
//printf("updating opMask to %.2x\n",opMask);
}
}
for (int i=0; i<melodicChans; i++) { for (int i=0; i<melodicChans; i++) {
int ops=(slots[3][i]!=255 && chan[i].state.ops==4 && oplType==3)?4:2; int ops=(slots[3][i]!=255 && chan[i].state.ops==4 && oplType==3)?4:2;
@ -1242,15 +1251,6 @@ void DivPlatformOPL::tick(bool sysTick) {
} }
} }
if (update4OpMask) {
update4OpMask=false;
if (oplType==3) {
unsigned char opMask=(int)(chan[0].fourOp)|(chan[2].fourOp<<1)|(chan[4].fourOp<<2)|(chan[6].fourOp<<3)|(chan[8].fourOp<<4)|(chan[10].fourOp<<5);
immWrite(0x104,opMask);
//printf("updating opMask to %.2x\n",opMask);
}
}
// update drums // update drums
if (properDrums) { if (properDrums) {
bool updateDrums=false; bool updateDrums=false;