horrible build failure
This commit is contained in:
parent
0602a2f811
commit
4b1605f2c2
6 changed files with 4 additions and 11 deletions
|
|
@ -65,7 +65,7 @@ class DivPlatformAY8910: public DivDispatch {
|
|||
|
||||
struct DAC {
|
||||
int sample, rate, period, pos, out;
|
||||
bool furnaceDAC, setPos;
|
||||
bool setPos;
|
||||
|
||||
DAC():
|
||||
sample(-1),
|
||||
|
|
@ -73,7 +73,6 @@ class DivPlatformAY8910: public DivDispatch {
|
|||
period(0),
|
||||
pos(0),
|
||||
out(0),
|
||||
furnaceDAC(false),
|
||||
setPos(false) {}
|
||||
} dac;
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ class DivPlatformAY8930: public DivDispatch {
|
|||
|
||||
struct DAC {
|
||||
int sample, rate, period, pos, out;
|
||||
bool furnaceDAC, setPos;
|
||||
bool setPos;
|
||||
|
||||
DAC():
|
||||
sample(-1),
|
||||
|
|
@ -73,7 +73,6 @@ class DivPlatformAY8930: public DivDispatch {
|
|||
period(0),
|
||||
pos(0),
|
||||
out(0),
|
||||
furnaceDAC(false),
|
||||
setPos(false) {}
|
||||
} dac;
|
||||
|
||||
|
|
|
|||
|
|
@ -120,7 +120,6 @@ class DivPlatformOPN: public DivPlatformFMBase {
|
|||
|
||||
struct OPNChannel: public FMChannel {
|
||||
unsigned char psgMode, autoEnvNum, autoEnvDen;
|
||||
bool furnacePCM;
|
||||
int sample, macroVolMul;
|
||||
|
||||
OPNChannel():
|
||||
|
|
@ -128,7 +127,6 @@ class DivPlatformOPN: public DivPlatformFMBase {
|
|||
psgMode(1),
|
||||
autoEnvNum(0),
|
||||
autoEnvDen(0),
|
||||
furnacePCM(false),
|
||||
sample(-1),
|
||||
macroVolMul(255) {}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ class DivPlatformGenesis: public DivPlatformOPN {
|
|||
};
|
||||
|
||||
struct Channel: public FMChannelStereo {
|
||||
bool furnaceDac;
|
||||
bool dacMode;
|
||||
int dacPeriod;
|
||||
int dacRate;
|
||||
|
|
@ -49,7 +48,6 @@ class DivPlatformGenesis: public DivPlatformOPN {
|
|||
signed char dacOutput;
|
||||
Channel():
|
||||
FMChannelStereo(),
|
||||
furnaceDac(false),
|
||||
dacMode(false),
|
||||
dacPeriod(0),
|
||||
dacRate(0),
|
||||
|
|
|
|||
|
|
@ -26,14 +26,13 @@ class DivPlatformMMC5: public DivDispatch {
|
|||
struct Channel: public SharedChannel<signed char> {
|
||||
int prevFreq;
|
||||
unsigned char duty, sweep;
|
||||
bool sweepChanged, furnaceDac, setPos;
|
||||
bool sweepChanged, setPos;
|
||||
Channel():
|
||||
SharedChannel<signed char>(15),
|
||||
prevFreq(65535),
|
||||
duty(0),
|
||||
sweep(8),
|
||||
sweepChanged(false),
|
||||
furnaceDac(false),
|
||||
setPos(false) {}
|
||||
};
|
||||
Channel chan[5];
|
||||
|
|
|
|||
|
|
@ -1603,7 +1603,7 @@ bool FurnaceFilePicker::draw(ImGuiWindowFlags winFlags) {
|
|||
}
|
||||
|
||||
// OK/Cancel buttons
|
||||
ImGui::BeginDisabled(entryName.empty() && chosenEntries.empty());
|
||||
ImGui::BeginDisabled(entryName.empty() && chosenEntries.empty() && !dirSelect);
|
||||
if (ImGui::Button(_("OK"))) {
|
||||
// accept entry
|
||||
acknowledged=true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue