6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 23:52:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1115 from TomHarte/DynamicCull

Browse Source 
Restore repeated lookup of timed machine under macOS.
This commit is contained in:
Thomas Harte 2023-01-13 22:08:29 -05:00 committed by GitHub
commit 84cb7df1be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OSBindings/Mac/Clock Signal/Machine/CSMachine.mm
View File

@ -43,10 +43,12 @@ struct MachineUpdater {
// Top out at 1/20th of a second; this is a safeguard against a negative // Top out at 1/20th of a second; this is a safeguard against a negative
// feedback loop if emulation starts running slowly. // feedback loop if emulation starts running slowly.
const auto seconds = std::min(Time::seconds(duration), 0.05); const auto seconds = std::min(Time::seconds(duration), 0.05);
machine->run_for(seconds); timed_machine = machine->timed_machine();
timed_machine->run_for(seconds);
} }
MachineTypes::TimedMachine *machine = nullptr; Machine::DynamicMachine *machine = nullptr;
MachineTypes::TimedMachine *timed_machine = nullptr;
}; };
} }
@ -148,7 +150,7 @@ struct ActivityObserver: public Activity::Observer {
[missingROMs appendString:[NSString stringWithUTF8String:wstring_converter.to_bytes(description).c_str()]]; [missingROMs appendString:[NSString stringWithUTF8String:wstring_converter.to_bytes(description).c_str()]];
return nil; return nil;
} }
updater.performer.machine = _machine->timed_machine(); updater.performer.machine = _machine.get();
if(updater.performer.machine) { if(updater.performer.machine) {
updater.start(); updater.start();
} }
@ -687,7 +689,7 @@ struct ActivityObserver: public Activity::Observer {
updater.enqueue([weakSelf] { updater.enqueue([weakSelf] {
CSMachine *const strongSelf = weakSelf; CSMachine *const strongSelf = weakSelf;
if(strongSelf) { if(strongSelf) {
strongSelf->updater.performer.machine->flush_output(MachineTypes::TimedMachine::Output::Audio); strongSelf->updater.performer.timed_machine->flush_output(MachineTypes::TimedMachine::Output::Audio);
} }
}); });
} }
@ -703,7 +705,7 @@ struct ActivityObserver: public Activity::Observer {
// Grab a pointer to the timed machine from somewhere where it has already // Grab a pointer to the timed machine from somewhere where it has already
// been dynamically cast, to avoid that cost here. // been dynamically cast, to avoid that cost here.
MachineTypes::TimedMachine *const timed_machine = strongSelf->updater.performer.machine; MachineTypes::TimedMachine *const timed_machine = strongSelf->updater.performer.timed_machine;
// Definitely update video; update audio too if that pipeline is looking a little dry. // Definitely update video; update audio too if that pipeline is looking a little dry.
auto outputs = MachineTypes::TimedMachine::Output::Video; auto outputs = MachineTypes::TimedMachine::Output::Video;