s416496/musique
1
0
Fork 0
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

Elegant exit (not aborting due to thread issues)

Browse Source
This commit is contained in:
Robert Bendun 2022-06-23 07:36:28 +02:00
parent 7b572e2a1f
commit 4d272723c7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/midi

@ -1 +1 @@
Subproject commit fb7d28563bf731b0a689ce9902dfad0ec9e63b19 Subproject commit ed5d959e60fd021ae4e545e0b39fe90cd1ec35a1

9
src/main.cc
View File

@ -81,6 +81,7 @@ struct Runner
midi::ALSA alsa; midi::ALSA alsa;
Interpreter interpreter; Interpreter interpreter;
std::thread midi_input_event_loop; std::thread midi_input_event_loop;
std::stop_source stop_source;
/// Setup interpreter and midi connection with given port /// Setup interpreter and midi connection with given port
Runner(std::string input_port, std::string output_port) Runner(std::string input_port, std::string output_port)
@ -106,6 +107,7 @@ struct Runner
if (alsa_go) { if (alsa_go) {
interpreter.register_callbacks(); interpreter.register_callbacks();
midi_input_event_loop = std::thread([this] { handle_midi_event_loop(); }); midi_input_event_loop = std::thread([this] { handle_midi_event_loop(); });
midi_input_event_loop.detach();
} }
Env::global->force_define("say", +[](Interpreter&, std::vector<Value> args) -> Result<Value> { Env::global->force_define("say", +[](Interpreter&, std::vector<Value> args) -> Result<Value> {
@ -119,6 +121,11 @@ struct Runner
}); });
} }
~Runner()
{
stop_source.request_stop();
}
Runner(Runner const&) = delete; Runner(Runner const&) = delete;
Runner(Runner &&) = delete; Runner(Runner &&) = delete;
Runner& operator=(Runner const&) = delete; Runner& operator=(Runner const&) = delete;
@ -126,7 +133,7 @@ struct Runner
void handle_midi_event_loop() void handle_midi_event_loop()
{ {
alsa.input_event_loop(); alsa.input_event_loop(stop_source.get_token());
} }
/// Run given source /// Run given source