Merge branch 'master' of https://github.com/tildearrow/furnace into command-palette

This commit is contained in:
YohananDiamond 2023-07-25 00:02:08 -03:00
commit f3902e151e
202 changed files with 3884 additions and 1226 deletions

View file

@ -239,6 +239,9 @@ enum FurnaceGUIColors {
GUI_COLOR_INSTR_POKEMINI,
GUI_COLOR_INSTR_SM8521,
GUI_COLOR_INSTR_PV1000,
GUI_COLOR_INSTR_K053260,
GUI_COLOR_INSTR_SCSP,
GUI_COLOR_INSTR_TED,
GUI_COLOR_INSTR_UNKNOWN,
GUI_COLOR_CHANNEL_BG,
@ -1316,7 +1319,7 @@ class FurnaceGUI {
bool vgmExportDirectStream, displayInsTypeList;
bool portrait, injectBackUp, mobileMenuOpen, warnColorPushed;
bool wantCaptureKeyboard, oldWantCaptureKeyboard, displayMacroMenu;
bool displayNew, displayPalette, fullScreen, preserveChanPos, wantScrollList, noteInputPoly;
bool displayNew, displayPalette, fullScreen, preserveChanPos, wantScrollList, noteInputPoly, notifyWaveChange;
bool displayPendingIns, pendingInsSingle, displayPendingRawSample, snesFilterHex, modTableHex, displayEditString;
bool mobileEdit;
bool killGraphics;
@ -1340,7 +1343,7 @@ class FurnaceGUI {
String pendingRawSample;
int pendingRawSampleDepth, pendingRawSampleChannels;
bool pendingRawSampleUnsigned, pendingRawSampleBigEndian, pendingRawSampleSwapNibbles;
bool pendingRawSampleUnsigned, pendingRawSampleBigEndian, pendingRawSampleSwapNibbles, pendingRawSampleReplace;
ImGuiWindowFlags globalWinFlags;
@ -1424,6 +1427,7 @@ class FurnaceGUI {
int chipNames;
int overflowHighlight;
int partyTime;
int flatNotes;
int germanNotation;
int stepOnDelete;
int scrollStep;
@ -1526,13 +1530,13 @@ class FurnaceGUI {
int pullDeleteRow;
int newSongBehavior;
int memUsageUnit;
int cursorFollowsWheel;
unsigned int maxUndoSteps;
String mainFontPath;
String patFontPath;
String audioDevice;
String midiInDevice;
String midiOutDevice;
String c163Name;
String renderBackend;
String renderDriver;
String initialSysName;
@ -1680,13 +1684,13 @@ class FurnaceGUI {
pullDeleteRow(1),
newSongBehavior(0),
memUsageUnit(1),
cursorFollowsWheel(0),
maxUndoSteps(100),
mainFontPath(""),
patFontPath(""),
audioDevice(""),
midiInDevice(""),
midiOutDevice(""),
c163Name(""),
renderBackend(""),
renderDriver(""),
initialSysName("Sega Genesis/Mega Drive"),
@ -1920,7 +1924,8 @@ class FurnaceGUI {
int dummyRows, demandX;
int transposeAmount, randomizeMin, randomizeMax, fadeMin, fadeMax, collapseAmount;
float scaleMax;
bool fadeMode, randomMode, haveHitBounds, pendingStepUpdate;
bool fadeMode, randomMode, haveHitBounds;
signed char pendingStepUpdate;
int oldOrdersLen;
DivOrders oldOrders;
@ -2294,6 +2299,7 @@ class FurnaceGUI {
bool quitRender();
const char* getSystemName(DivSystem which);
const char* getSystemPartNumber(DivSystem sys, DivConfig& flags);
public:
void editStr(String* which);