6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-09 05:25:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #829 from TomHarte/MSXCrash

Browse Source 
Ensures proper handover of speaker state when picking in a multimachine.
This commit is contained in:
Thomas Harte
2020-07-30 23:04:55 -04:00
committed by GitHub
parent 9c97c0a906 cdde57fcf2
commit 1e6d03246b
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Analyser/Dynamic/MultiMachine/MultiMachine.cpp
View File

@@ -89,9 +89,28 @@ void MultiMachine::did_run_machines(MultiTimedMachine *) {
void MultiMachine::pick_first() { void MultiMachine::pick_first() {
has_picked_ = true; has_picked_ = true;
// Ensure output rate specifics are properly copied; these may be set only once by the owner,
// but rather than being propagated directly by the MultiSpeaker only the derived computed
// output rate is propagated. So this ensures that if a new derivation is made, it's made correctly.
if(machines_[0]->audio_producer()) {
auto multi_speaker = audio_producer_.get_speaker();
auto specific_speaker = machines_[0]->audio_producer()->get_speaker();
if(specific_speaker && multi_speaker) {
specific_speaker->copy_output_rate(*multi_speaker);
}
}
// TODO: because it is not invalid for a caller to keep a reference to anything previously returned,
// this erase can be added only once the Multi machines that take static copies of the machines list
// are updated.
//
// Example failing use case otherwise: a caller still has reference to the MultiJoystickMachine, and
// it has dangling references to the various JoystickMachines.
//
// This gets into particularly long grass with the MultiConfigurable and its MultiStruct.
// machines_.erase(machines_.begin() + 1, machines_.end()); // machines_.erase(machines_.begin() + 1, machines_.end());
// TODO: this isn't quite correct, because it may leak OpenGL/etc resources through failure to
// request a close_output while the context is active.
} }
void *MultiMachine::raw_pointer() { void *MultiMachine::raw_pointer() {

10
Outputs/Speaker/Speaker.hpp
View File

@@ -45,6 +45,16 @@ class Speaker {
compute_output_rate(); compute_output_rate();
} }
/*!
Takes a copy of the most recent output rate provided to @c rhs.
*/
void copy_output_rate(const Speaker &rhs) {
output_cycles_per_second_ = rhs.output_cycles_per_second_;
output_buffer_size_ = rhs.output_buffer_size_;
stereo_output_.store(rhs.stereo_output_.load(std::memory_order::memory_order_relaxed), std::memory_order::memory_order_relaxed);
compute_output_rate();
}
/// Sets the output volume, in the range [0, 1]. /// Sets the output volume, in the range [0, 1].
virtual void set_output_volume(float) = 0; virtual void set_output_volume(float) = 0;