Merge branch 'master' of https://github.com/tildearrow/furnace into ga20
This commit is contained in:
commit
f627c4728f
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -397,9 +397,13 @@ void DivPlatformK007232::forceIns() {
|
||||||
while (!writes.empty()) writes.pop();
|
while (!writes.empty()) writes.pop();
|
||||||
for (int i=0; i<2; i++) {
|
for (int i=0; i<2; i++) {
|
||||||
chan[i].insChanged=true;
|
chan[i].insChanged=true;
|
||||||
|
chan[i].volumeChanged=true;
|
||||||
chan[i].freqChanged=true;
|
chan[i].freqChanged=true;
|
||||||
chan[i].sample=-1;
|
chan[i].prevFreq=-1;
|
||||||
|
chan[i].prevBank=-1;
|
||||||
}
|
}
|
||||||
|
lastLoop=0;
|
||||||
|
lastVolume=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void* DivPlatformK007232::getChanState(int ch) {
|
void* DivPlatformK007232::getChanState(int ch) {
|
||||||
|
@ -422,6 +426,7 @@ void DivPlatformK007232::reset() {
|
||||||
k007232.reset();
|
k007232.reset();
|
||||||
lastLoop=0;
|
lastLoop=0;
|
||||||
lastVolume=0;
|
lastVolume=0;
|
||||||
|
delay=0;
|
||||||
for (int i=0; i<2; i++) {
|
for (int i=0; i<2; i++) {
|
||||||
chan[i]=DivPlatformK007232::Channel();
|
chan[i]=DivPlatformK007232::Channel();
|
||||||
chan[i].std.setEngine(parent);
|
chan[i].std.setEngine(parent);
|
||||||
|
|
|
@ -123,7 +123,7 @@ int DivPlatformPokeMini::dispatch(DivCommand c) {
|
||||||
vol=(chan[c.chan].outVol==2)?3:chan[c.chan].outVol;
|
vol=(chan[c.chan].outVol==2)?3:chan[c.chan].outVol;
|
||||||
chan[c.chan].active=true;
|
chan[c.chan].active=true;
|
||||||
chan[c.chan].keyOn=true;
|
chan[c.chan].keyOn=true;
|
||||||
chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_BEEPER));
|
chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_POKEMINI));
|
||||||
if (!parent->song.brokenOutVol && !chan[c.chan].std.vol.will) {
|
if (!parent->song.brokenOutVol && !chan[c.chan].std.vol.will) {
|
||||||
chan[c.chan].outVol=chan[c.chan].vol;
|
chan[c.chan].outVol=chan[c.chan].vol;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
# modified version
|
# modified version
|
||||||
|
|
||||||
this is a modified version of ymfm with a small bug fix.
|
this is a modified version which contains many fixes.
|
||||||
|
|
||||||
## Supported environments
|
## Supported environments
|
||||||
|
|
||||||
|
|
|
@ -174,7 +174,7 @@ public:
|
||||||
// system-wide registers
|
// system-wide registers
|
||||||
uint32_t test() const { return byte(0x01, 0, 8); }
|
uint32_t test() const { return byte(0x01, 0, 8); }
|
||||||
uint32_t lfo_reset() const { return byte(0x01, 1, 1); }
|
uint32_t lfo_reset() const { return byte(0x01, 1, 1); }
|
||||||
uint32_t noise_frequency() const { return byte(0x0f, 0, 5) ^ 0x1f; }
|
uint32_t noise_frequency() const { return byte(0x0f, 0, 5); }
|
||||||
uint32_t noise_enable() const { return byte(0x0f, 7, 1); }
|
uint32_t noise_enable() const { return byte(0x0f, 7, 1); }
|
||||||
uint32_t timer_a_value() const { return word(0x10, 0, 8, 0x11, 0, 2); }
|
uint32_t timer_a_value() const { return word(0x10, 0, 8, 0x11, 0, 2); }
|
||||||
uint32_t timer_b_value() const { return byte(0x12, 0, 8); }
|
uint32_t timer_b_value() const { return byte(0x12, 0, 8); }
|
||||||
|
|
|
@ -22,6 +22,10 @@
|
||||||
typedef HRESULT (*SPDA)(int);
|
typedef HRESULT (*SPDA)(int);
|
||||||
|
|
||||||
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prevInst, PSTR args, int state) {
|
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prevInst, PSTR args, int state) {
|
||||||
|
if (AttachConsole(ATTACH_PARENT_PROCESS)==0) {
|
||||||
|
if (GetLastError()==ERROR_ACCESS_DENIED) FreeConsole();
|
||||||
|
}
|
||||||
|
|
||||||
int argc=0;
|
int argc=0;
|
||||||
wchar_t** argw=CommandLineToArgvW(GetCommandLineW(),&argc);
|
wchar_t** argw=CommandLineToArgvW(GetCommandLineW(),&argc);
|
||||||
char** argv=new char*[argc+1];
|
char** argv=new char*[argc+1];
|
||||||
|
|
Loading…
Reference in New Issue