6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-29 12:50:28 +00:00
Code Issues Projects Releases Wiki Activity

Switches to accepting a bit mask of events to run_until.

Browse Source
This commit is contained in:
Thomas Harte 2020-01-20 16:08:21 -05:00
parent 8adb2283b5
commit 3c760e585a
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Machines/CRTMachine.hpp
View File

@ -71,32 +71,33 @@ class Machine {
return total_runtime;
}
enum class MachineEvent {
enum MachineEvent: int {
/// At least one new packet of audio has been delivered to the spaker's delegate.
NewSpeakerSamplesGenerated
NewSpeakerSamplesGenerated = 1 << 0
};
/*!
Runs for at least @c duration seconds, and then until @c event has occurred at least once since this
Runs for at least @c duration seconds, and then every one of the @c events has occurred at least once since this
call to @c run_until_event.
@param events A bitmask comprised of @c MachineEvent flags.
@returns The amount of time run for.
*/
Time::Seconds run_until(Time::Seconds minimum_duration, MachineEvent event) {
switch(event) {
case MachineEvent::NewSpeakerSamplesGenerated: {
const auto speaker = get_speaker();
if(!speaker) {
run_for(minimum_duration);
return minimum_duration;
}
const int sample_sets = speaker->completed_sample_sets();
return run_until(minimum_duration, [sample_sets, speaker]() {
return speaker->completed_sample_sets() != sample_sets;
});
} break;
Time::Seconds run_until(Time::Seconds minimum_duration, int events) {
// Tie up a wait-for-samples, if requested.
const Outputs::Speaker::Speaker *speaker = nullptr;
int sample_sets = 0;
if(events & MachineEvent::NewSpeakerSamplesGenerated) {
speaker = get_speaker();
if(!speaker) events &= ~MachineEvent::NewSpeakerSamplesGenerated;
sample_sets = speaker->completed_sample_sets();
}
// Run until all requested events are satisfied.
return run_until(minimum_duration, [=]() {
return
(!(events & MachineEvent::NewSpeakerSamplesGenerated) || (sample_sets != speaker->completed_sample_sets()));
});
}
protected:

2
OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme
View File

@ -67,7 +67,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
enableASanStackUseAfterReturn = "YES"

2
Outputs/Speaker/Speaker.hpp
View File

@ -26,7 +26,7 @@ class Speaker {
virtual float get_ideal_clock_rate_in_range(float minimum, float maximum) = 0;
virtual void set_output_rate(float cycles_per_second, int buffer_size) = 0;
int completed_sample_sets() { return completed_sample_sets_; }
int completed_sample_sets() const { return completed_sample_sets_; }
struct Delegate {
virtual void speaker_did_complete_samples(Speaker *speaker, const std::vector<int16_t> &buffer) = 0;