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

order the text

Browse source
This commit is contained in:
Eknous-P 2024-03-23 23:24:59 +04:00
parent a8bd9ac454
commit e65f19718a
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/guiConst.cpp
View file

@ -251,6 +251,9 @@ const char* chanNames[]={
"Channels" // in case this makes l10n easier "Channels" // in case this makes l10n easier
}; };
// because someone will complain about the ordering
unsigned char chanNamesHierarchy[]={0,5,1,2,3,6,9,10,8,4,7,11,12};
const FurnaceGUIColors fxColors[256]={ const FurnaceGUIColors fxColors[256]={
GUI_COLOR_PATTERN_EFFECT_MISC, // 00 GUI_COLOR_PATTERN_EFFECT_MISC, // 00
GUI_COLOR_PATTERN_EFFECT_PITCH, // 01 GUI_COLOR_PATTERN_EFFECT_PITCH, // 01

1
src/gui/guiConst.h
View file

@ -60,3 +60,4 @@ extern const int vgmVersions[7];
extern const FurnaceGUIColors fxColors[256]; extern const FurnaceGUIColors fxColors[256];
extern const char* fxColorsNames[10]; extern const char* fxColorsNames[10];
extern const char* chanNames[]; extern const char* chanNames[];
extern unsigned char chanNamesHierarchy[];

6
src/gui/sysMiscInfo.cpp
View file

@ -312,6 +312,7 @@ void FurnaceGUI::drawSystemChannelInfoText(const DivSysDef* whichDef) {
case DIV_INS_BEEPER: case DIV_INS_BEEPER:
case DIV_INS_TED: case DIV_INS_TED:
case DIV_INS_VIC: case DIV_INS_VIC:
case DIV_INS_T6W28:
if (whichDef->id==0xfd) { // dummy if (whichDef->id==0xfd) { // dummy
chanCount[11]++; chanCount[11]++;
break; break;
@ -320,7 +321,7 @@ void FurnaceGUI::drawSystemChannelInfoText(const DivSysDef* whichDef) {
chanCount[1]++; chanCount[1]++;
break; break;
} }
if (whichDef->chanTypes[i]==DIV_CH_NOISE) { // sn noise if (whichDef->chanTypes[i]==DIV_CH_NOISE) { // sn/t6w noise
chanCount[2]++; chanCount[2]++;
} else { // DIV_CH_PULSE, any sqr chan } else { // DIV_CH_PULSE, any sqr chan
chanCount[5]++; chanCount[5]++;
@ -395,7 +396,8 @@ void FurnaceGUI::drawSystemChannelInfoText(const DivSysDef* whichDef) {
} }
} }
for (int i=0; i<12; i++) { for (int j=0; j<12; j++) {
unsigned char i=chanNamesHierarchy[j];
if (chanCount[i]==0) continue; if (chanCount[i]==0) continue;
if (info.length()!=0) { if (info.length()!=0) {
info+=", "; info+=", ";