6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-25 11:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into FinalOverride

Browse Source
This commit is contained in:
Thomas Harte
2020-01-26 23:42:25 -05:00
parent 294e09f275 50be991415
commit 7316a3aa88
11 changed files with 241 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Analyser/Dynamic/MultiMachine/Implementation/MultiSpeaker.cpp
+2 -2
View File
@@ -37,9 +37,9 @@ float MultiSpeaker::get_ideal_clock_rate_in_range(float minimum, float maximum)
return ideal / static_cast<float>(speakers_.size());
}
void MultiSpeaker::set_output_rate(float cycles_per_second, int buffer_size) {
void MultiSpeaker::set_computed_output_rate(float cycles_per_second, int buffer_size) {
for(const auto &speaker: speakers_) {
speaker->set_output_rate(cycles_per_second, buffer_size);
speaker->set_computed_output_rate(cycles_per_second, buffer_size);
}
}
Analyser/Dynamic/MultiMachine/Implementation/MultiSpeaker.hpp
+3 -3
View File
@@ -38,9 +38,9 @@ class MultiSpeaker: public Outputs::Speaker::Speaker, Outputs::Speaker::Speaker:
void set_new_front_machine(::Machine::DynamicMachine *machine);
// Below is the standard Outputs::Speaker::Speaker interface; see there for documentation.
float get_ideal_clock_rate_in_range(float minimum, float maximum) final;
void set_output_rate(float cycles_per_second, int buffer_size) final;
void set_delegate(Outputs::Speaker::Speaker::Delegate *delegate) final;
float get_ideal_clock_rate_in_range(float minimum, float maximum) override;
void set_computed_output_rate(float cycles_per_second, int buffer_size) override;
void set_delegate(Outputs::Speaker::Speaker::Delegate *delegate) override;
private:
void speaker_did_complete_samples(Speaker *speaker, const std::vector<int16_t> &buffer) final;