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

prepare for splitting OPN/OPM and NES/SN

Browse source
This commit is contained in:
tildearrow 2022-09-23 03:41:38 -05:00
parent 5a84a35f3d
commit 764ae60740
5 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/instrument.h
View file

@ -60,8 +60,8 @@ enum DivInstrumentType: unsigned short {
DIV_INS_SU=30, DIV_INS_SU=30,
DIV_INS_NAMCO=31, DIV_INS_NAMCO=31,
DIV_INS_OPL_DRUMS=32, DIV_INS_OPL_DRUMS=32,
//33 DIV_INS_OPM=33,
//34 DIV_INS_NES=34,
DIV_INS_MSM6258=35, DIV_INS_MSM6258=35,
DIV_INS_MSM6295=36, DIV_INS_MSM6295=36,
DIV_INS_ADPCMA=37, DIV_INS_ADPCMA=37,

8
src/gui/dataList.cpp
View file

@ -338,6 +338,14 @@ void FurnaceGUI::drawInsList(bool asChild) {
ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_OPL_DRUMS]); ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_OPL_DRUMS]);
name=fmt::sprintf(ICON_FA_COFFEE " %.2X: %s##_INS%d",i,ins->name,i); name=fmt::sprintf(ICON_FA_COFFEE " %.2X: %s##_INS%d",i,ins->name,i);
break; break;
case DIV_INS_OPM:
ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_OPM]);
name=fmt::sprintf(ICON_FA_AREA_CHART " %.2X: %s##_INS%d",i,ins->name,i);
break;
case DIV_INS_NES:
ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_NES]);
name=fmt::sprintf(ICON_FA_GAMEPAD " %.2X: %s##_INS%d",i,ins->name,i);
break;
case DIV_INS_MSM6258: case DIV_INS_MSM6258:
ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_MSM6258]); ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_MSM6258]);
name=fmt::sprintf(ICON_FA_VOLUME_UP " %.2X: %s##_INS%d",i,ins->name,i); name=fmt::sprintf(ICON_FA_VOLUME_UP " %.2X: %s##_INS%d",i,ins->name,i);

2
src/gui/gui.h
View file

@ -159,6 +159,8 @@ enum FurnaceGUIColors {
GUI_COLOR_INSTR_SU, GUI_COLOR_INSTR_SU,
GUI_COLOR_INSTR_NAMCO, GUI_COLOR_INSTR_NAMCO,
GUI_COLOR_INSTR_OPL_DRUMS, GUI_COLOR_INSTR_OPL_DRUMS,
GUI_COLOR_INSTR_OPM,
GUI_COLOR_INSTR_NES,
GUI_COLOR_INSTR_MSM6258, GUI_COLOR_INSTR_MSM6258,
GUI_COLOR_INSTR_MSM6295, GUI_COLOR_INSTR_MSM6295,
GUI_COLOR_INSTR_ADPCMA, GUI_COLOR_INSTR_ADPCMA,

10
src/gui/guiConst.cpp
View file

@ -80,8 +80,8 @@ const int vgmVersions[6]={
}; };
const char* insTypes[DIV_INS_MAX+1]={ const char* insTypes[DIV_INS_MAX+1]={
"Standard (SMS/NES)", "SN76489/Sega PSG",
"FM (4-operator)", "FM (OPN)",
"Game Boy", "Game Boy",
"C64", "C64",
"Generic Sample", "Generic Sample",
@ -113,8 +113,8 @@ const char* insTypes[DIV_INS_MAX+1]={
"Sound Unit", "Sound Unit",
"Namco WSG", "Namco WSG",
"OPL (drums)", "OPL (drums)",
"Reserved", // 33 "FM (OPM)", // 33
"Reserved", // 34 "NES", // 34
"MSM6258", "MSM6258",
"MSM6295", "MSM6295",
"ADPCM-A", "ADPCM-A",
@ -788,6 +788,8 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={
D(GUI_COLOR_INSTR_SU,"",ImVec4(0.95f,0.98f,1.0f,1.0f)), D(GUI_COLOR_INSTR_SU,"",ImVec4(0.95f,0.98f,1.0f,1.0f)),
D(GUI_COLOR_INSTR_NAMCO,"",ImVec4(1.0f,1.0f,0.0f,1.0f)), D(GUI_COLOR_INSTR_NAMCO,"",ImVec4(1.0f,1.0f,0.0f,1.0f)),
D(GUI_COLOR_INSTR_OPL_DRUMS,"",ImVec4(0.3f,1.0f,0.9f,1.0f)), D(GUI_COLOR_INSTR_OPL_DRUMS,"",ImVec4(0.3f,1.0f,0.9f,1.0f)),
D(GUI_COLOR_INSTR_OPM,"",ImVec4(0.2f,0.6f,1.0f,1.0f)),
D(GUI_COLOR_INSTR_NES,"",ImVec4(0.4f,1.0f,0.3f,1.0f)),
D(GUI_COLOR_INSTR_MSM6258,"",ImVec4(1.0f,0.5f,0.5f,1.0f)), D(GUI_COLOR_INSTR_MSM6258,"",ImVec4(1.0f,0.5f,0.5f,1.0f)),
D(GUI_COLOR_INSTR_MSM6295,"",ImVec4(1.0f,0.5f,0.5f,1.0f)), D(GUI_COLOR_INSTR_MSM6295,"",ImVec4(1.0f,0.5f,0.5f,1.0f)),
D(GUI_COLOR_INSTR_ADPCMA,"",ImVec4(1.0f,0.5f,0.5f,1.0f)), D(GUI_COLOR_INSTR_ADPCMA,"",ImVec4(1.0f,0.5f,0.5f,1.0f)),

6
src/gui/settings.cpp
View file

@ -1636,8 +1636,8 @@ void FurnaceGUI::drawSettings() {
ImGui::TreePop(); ImGui::TreePop();
} }
if (ImGui::TreeNode("Instrument Types")) { if (ImGui::TreeNode("Instrument Types")) {
UI_COLOR_CONFIG(GUI_COLOR_INSTR_FM,"FM (4-operator)"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_FM,"FM (OPN)");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_STD,"Standard"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_STD,"SN76489/Sega PSG");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_GB,"Game Boy"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_GB,"Game Boy");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_C64,"C64"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_C64,"C64");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_AMIGA,"Amiga/Generic Sample"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_AMIGA,"Amiga/Generic Sample");
@ -1673,6 +1673,8 @@ void FurnaceGUI::drawSettings() {
UI_COLOR_CONFIG(GUI_COLOR_INSTR_SU,"Sound Unit"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_SU,"Sound Unit");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_NAMCO,"Namco WSG"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_NAMCO,"Namco WSG");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_OPL_DRUMS,"FM (OPL Drums)"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_OPL_DRUMS,"FM (OPL Drums)");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_OPM,"FM (OPM)");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_NES,"NES");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_MSM6258,"MSM6258"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_MSM6258,"MSM6258");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_MSM6295,"MSM6295"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_MSM6295,"MSM6295");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_ADPCMA,"ADPCM-A"); UI_COLOR_CONFIG(GUI_COLOR_INSTR_ADPCMA,"ADPCM-A");