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

so many more cases

Browse source
This commit is contained in:
Eknous-P 2024-03-23 23:14:31 +04:00
parent 934df04639
commit a8bd9ac454
2 changed files with 53 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui/guiConst.cpp
View file

@ -239,11 +239,13 @@ const char* chanNames[]={
"Noise", "Noise",
"Wavetable", "Wavetable",
"Sample", "Sample",
// the "freaks":
"Square", // the "freaks" "Square",
"Triangle", "Triangle", // nes
"Ext. Operator", "Ext. Operator",
"Drums", "Drums",
"Slope", // powernoiseee
"VERA", // Daviiid!!
"Channel", // if neither "Channel", // if neither
"Channels" // in case this makes l10n easier "Channels" // in case this makes l10n easier

59
src/gui/sysMiscInfo.cpp
View file

@ -303,18 +303,26 @@ void FurnaceGUI::drawSystemChannelInfo(const DivSysDef* whichDef) {
void FurnaceGUI::drawSystemChannelInfoText(const DivSysDef* whichDef) { void FurnaceGUI::drawSystemChannelInfoText(const DivSysDef* whichDef) {
String info=""; String info="";
// same order as chanNames // same order as chanNames
// helper: FM|PU|NO|WA|SP|SQ|TR|OP|DR|CH // helper: FM|PU|NO|WA|SA|SQ|TR|OP|DR|SL|VE|CH
unsigned char chanCount[10]={0,0,0,0,0,0,0,0,0,0}; unsigned char chanCount[12];
memset(chanCount,0,sizeof(chanCount));
for (int i=0; i<whichDef->channels; i++) { for (int i=0; i<whichDef->channels; i++) {
switch (whichDef->chanInsType[i][0]) { switch (whichDef->chanInsType[i][0]) {
case DIV_INS_STD: // square case DIV_INS_STD: // square
case DIV_INS_BEEPER:
case DIV_INS_TED:
case DIV_INS_VIC:
if (whichDef->id==0xfd) { // dummy if (whichDef->id==0xfd) { // dummy
chanCount[9]++; chanCount[11]++;
break; break;
} }
if (whichDef->chanTypes[i]==DIV_CH_NOISE) { if (whichDef->id==0x9f) { // zx sfx
chanCount[1]++;
break;
}
if (whichDef->chanTypes[i]==DIV_CH_NOISE) { // sn noise
chanCount[2]++; chanCount[2]++;
} else { // DIV_CH_PULSE } else { // DIV_CH_PULSE, any sqr chan
chanCount[5]++; chanCount[5]++;
} }
break; break;
@ -347,27 +355,56 @@ void FurnaceGUI::drawSystemChannelInfoText(const DivSysDef* whichDef) {
chanCount[whichDef->chanTypes[i]]++; chanCount[whichDef->chanTypes[i]]++;
} }
break; break;
case DIV_INS_C64: case DIV_INS_POWERNOISE_SLOPE:
chanCount[9]++;
break;
case DIV_INS_QSOUND:
chanCount[4]++;
break;
case DIV_INS_NDS:
if (whichDef->chanTypes[i]!=DIV_CH_PCM) { // the psg chans can also play samples??
chanCount[4]++;
}
chanCount[whichDef->chanTypes[i]]++;
break;
case DIV_INS_VERA:
if (whichDef->chanTypes[i]==DIV_CH_PULSE) {
chanCount[10]++;
} else { // sample chan
chanCount[5]++;
}
break;
case DIV_INS_DAVE:
if (whichDef->chanTypes[i]==DIV_CH_WAVE) {
chanCount[11]++;
} else {
chanCount[whichDef->chanTypes[i]]++;
}
break;
case DIV_INS_C64: // uncategorizable (by me)
case DIV_INS_TIA: case DIV_INS_TIA:
case DIV_INS_PET: case DIV_INS_PET:
case DIV_INS_SU: case DIV_INS_SU:
chanCount[9]++; case DIV_INS_POKEY:
case DIV_INS_MIKEY:
chanCount[11]++;
break; break;
default: default:
chanCount[whichDef->chanTypes[i]]++; chanCount[whichDef->chanTypes[i]]++;
break; break;
} }
} }
for (int i=0; i<10; i++) {
for (int i=0; i<12; i++) {
if (chanCount[i]==0) continue; if (chanCount[i]==0) continue;
if (info.length()!=0) { if (info.length()!=0) {
info+=", "; info+=", ";
} }
if (i==9) { if (i==11) {
if (chanCount[i]>1) { if (chanCount[i]>1) {
info+=fmt::sprintf("%d %s",chanCount[i],chanNames[10]); info+=fmt::sprintf("%d %s",chanCount[i],chanNames[12]);
} else { } else {
info+=fmt::sprintf("%d %s",chanCount[i],chanNames[9]); info+=fmt::sprintf("%d %s",chanCount[i],chanNames[11]);
} }
continue; continue;
} }