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

Introduces an exit condition for the multi machine.

Browse Source
This commit is contained in:
Thomas Harte
2018-02-11 20:24:08 -05:00
parent 8eea55b51c
commit 9960121b08
2 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,35 +21,55 @@ MultiMachine::MultiMachine(std::vector<std::unique_ptr<DynamicMachine>> &&machin
} }
ConfigurationTarget::Machine *MultiMachine::configuration_target() { ConfigurationTarget::Machine *MultiMachine::configuration_target() {
return &configuration_target_; if(has_picked_) {
return machines_.front()->configuration_target();
} else {
return &configuration_target_;
}
} }
CRTMachine::Machine *MultiMachine::crt_machine() { CRTMachine::Machine *MultiMachine::crt_machine() {
return &crt_machine_; if(has_picked_) {
return machines_.front()->crt_machine();
} else {
return &crt_machine_;
}
} }
JoystickMachine::Machine *MultiMachine::joystick_machine() { JoystickMachine::Machine *MultiMachine::joystick_machine() {
return &joystick_machine_; if(has_picked_) {
return machines_.front()->joystick_machine();
} else {
return &joystick_machine_;
}
} }
KeyboardMachine::Machine *MultiMachine::keyboard_machine() { KeyboardMachine::Machine *MultiMachine::keyboard_machine() {
return &keyboard_machine_; if(has_picked_) {
return machines_.front()->keyboard_machine();
} else {
return &keyboard_machine_;
}
} }
Configurable::Device *MultiMachine::configurable_device() { Configurable::Device *MultiMachine::configurable_device() {
return &configurable_; if(has_picked_) {
return machines_.front()->configurable_device();
} else {
return &configurable_;
}
} }
void MultiMachine::multi_crt_did_run_machines() { void MultiMachine::multi_crt_did_run_machines() {
std::lock_guard<std::mutex> machines_lock(machines_mutex_); std::lock_guard<std::mutex> machines_lock(machines_mutex_);
DynamicMachine *front = machines_.front().get(); DynamicMachine *front = machines_.front().get();
// for(const auto &machine: machines_) { for(const auto &machine: machines_) {
// CRTMachine::Machine *crt = machine->crt_machine(); CRTMachine::Machine *crt = machine->crt_machine();
// printf("%0.2f ", crt->get_confidence()); printf("%0.2f ", crt->get_confidence());
// crt->print_type(); crt->print_type();
// printf("; "); printf("; ");
// } }
// printf("\n"); printf("\n");
std::stable_sort(machines_.begin(), machines_.end(), [] (const auto &lhs, const auto &rhs){ std::stable_sort(machines_.begin(), machines_.end(), [] (const auto &lhs, const auto &rhs){
CRTMachine::Machine *lhs_crt = lhs->crt_machine(); CRTMachine::Machine *lhs_crt = lhs->crt_machine();
@@ -60,4 +80,15 @@ void MultiMachine::multi_crt_did_run_machines() {
if(machines_.front().get() != front) { if(machines_.front().get() != front) {
crt_machine_.did_change_machine_order(); crt_machine_.did_change_machine_order();
} }
if(machines_.front()->crt_machine()->get_confidence() > 0.9) {
pick_first();
}
}
void MultiMachine::pick_first() {
has_picked_ = true;
// 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.
} }

3
Analyser/Dynamic/MultiMachine/MultiMachine.hpp
View File

@@ -57,6 +57,9 @@ class MultiMachine: public ::Machine::DynamicMachine, public MultiCRTMachine::De
MultiCRTMachine crt_machine_; MultiCRTMachine crt_machine_;
MultiJoystickMachine joystick_machine_; MultiJoystickMachine joystick_machine_;
MultiKeyboardMachine keyboard_machine_; MultiKeyboardMachine keyboard_machine_;
void pick_first();
bool has_picked_ = false;
}; };
} }