Merge branch 'master' into ZSMv1

src/gui/guiConst.cpp

@@ -488,6 +488,7 @@ const FurnaceGUIActionDef guiActions[GUI_ACTION_MAX]={
   D("WINDOW_NOTES", "Song Comments", 0),
   D("WINDOW_CHANNELS", "Channels", 0),
   D("WINDOW_PAT_MANAGER", "Pattern Manager", 0),
+  D("WINDOW_SYS_MANAGER", "Chip Manager", 0),
   D("WINDOW_REGISTER_VIEW", "Register View", 0),
   D("WINDOW_LOG", "Log Viewer", 0),
   D("EFFECT_LIST", "Effect List", 0),
@@ -839,7 +840,9 @@ const FurnaceGUIColorDef guiColors[GUI_COLOR_MAX]={
 };
 #undef D
 
-// define systems.
+// define chips here
+
+// all chips
 const int availableSystems[]={
   DIV_SYSTEM_YM2612,
   DIV_SYSTEM_YM2612_EXT,
@@ -911,3 +914,115 @@ const int availableSystems[]={
   0 // don't remove this last one!
 };
 
+// FM
+const int chipsFM[]={
+  DIV_SYSTEM_YM2612,
+  DIV_SYSTEM_YM2612_EXT,
+  DIV_SYSTEM_YM2612_FRAC,
+  DIV_SYSTEM_YM2612_FRAC_EXT,
+  DIV_SYSTEM_YM2151,
+  DIV_SYSTEM_YM2610,
+  DIV_SYSTEM_YM2610_EXT,
+  DIV_SYSTEM_YM2610_FULL,
+  DIV_SYSTEM_YM2610_FULL_EXT,
+  DIV_SYSTEM_YM2610B,
+  DIV_SYSTEM_YM2610B_EXT,
+  DIV_SYSTEM_YMU759,
+  DIV_SYSTEM_OPN,
+  DIV_SYSTEM_OPN_EXT,
+  DIV_SYSTEM_PC98,
+  DIV_SYSTEM_PC98_EXT,
+  DIV_SYSTEM_OPLL,
+  DIV_SYSTEM_OPLL_DRUMS,
+  DIV_SYSTEM_VRC7,
+  DIV_SYSTEM_OPL,
+  DIV_SYSTEM_OPL_DRUMS,
+  DIV_SYSTEM_Y8950,
+  DIV_SYSTEM_Y8950_DRUMS,
+  DIV_SYSTEM_OPL2,
+  DIV_SYSTEM_OPL2_DRUMS,
+  DIV_SYSTEM_OPL3,
+  DIV_SYSTEM_OPL3_DRUMS,
+  DIV_SYSTEM_OPZ,
+  0 // don't remove this last one!
+};
+
+// square
+const int chipsSquare[]={
+  DIV_SYSTEM_SMS,
+  DIV_SYSTEM_AY8910,
+  DIV_SYSTEM_PCSPKR,
+  DIV_SYSTEM_SAA1099,
+  DIV_SYSTEM_VIC20,
+  0 // don't remove this last one!
+};
+
+// wavetable
+const int chipsWave[]={
+  DIV_SYSTEM_PCE,
+  DIV_SYSTEM_X1_010,
+  DIV_SYSTEM_SWAN,
+  DIV_SYSTEM_BUBSYS_WSG,
+  DIV_SYSTEM_N163,
+  DIV_SYSTEM_FDS,
+  DIV_SYSTEM_SCC,
+  DIV_SYSTEM_SCC_PLUS,
+  DIV_SYSTEM_NAMCO,
+  DIV_SYSTEM_NAMCO_15XX,
+  DIV_SYSTEM_NAMCO_CUS30,
+  0 // don't remove this last one!
+};
+
+// specialized
+const int chipsSpecial[]={
+  DIV_SYSTEM_GB,
+  DIV_SYSTEM_NES,
+  DIV_SYSTEM_C64_8580,
+  DIV_SYSTEM_C64_6581,
+  DIV_SYSTEM_SFX_BEEPER,
+  DIV_SYSTEM_DUMMY,
+  DIV_SYSTEM_SOUND_UNIT,
+  DIV_SYSTEM_TIA,
+  DIV_SYSTEM_AY8930,
+  DIV_SYSTEM_LYNX,
+  DIV_SYSTEM_VERA,
+  DIV_SYSTEM_PET,
+  DIV_SYSTEM_VRC6,
+  DIV_SYSTEM_MMC5,
+  0 // don't remove this last one!
+};
+
+// sample
+const int chipsSample[]={
+  DIV_SYSTEM_SEGAPCM,
+  DIV_SYSTEM_SEGAPCM_COMPAT,
+  DIV_SYSTEM_AMIGA,
+  DIV_SYSTEM_QSOUND,
+  DIV_SYSTEM_X1_010,
+  DIV_SYSTEM_YMZ280B,
+  DIV_SYSTEM_MSM6258,
+  DIV_SYSTEM_MSM6295,
+  DIV_SYSTEM_RF5C68,
+  DIV_SYSTEM_PCM_DAC,
+  0 // don't remove this last one!
+};
+
+const int* chipCategories[]={
+  availableSystems,
+  chipsFM,
+  chipsSquare,
+  chipsWave,
+  chipsSpecial,
+  chipsSample,
+  NULL
+};
+
+const char* chipCategoryNames[]={
+  "All chips",
+  "FM",
+  "Square",
+  "Wavetable",
+  "Special",
+  "Sample",
+  NULL
+};