sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add mutex lock on internal command line process.

Browse source
This commit is contained in:
jofemodo 2021-08-26 12:54:21 +02:00
parent 07670686f9
commit 16789b6a6e
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clients/jack_client.cpp
View file

@ -194,7 +194,7 @@ bool load_instrument(const char *fpath) {
} }
std::vector<std::string> string_tokenize(std::string str) { std::vector<std::string> string_tokenize(const std::string str) {
std::vector<std::string> tokens; std::vector<std::string> tokens;
std::string part = ""; std::string part = "";
for (size_t i=0; i<str.length(); i++) { for (size_t i=0; i<str.length(); i++) {
@ -230,11 +230,16 @@ void cli_thread_proc() {
std::vector<std::string> tokens = string_tokenize(args); std::vector<std::string> tokens = string_tokenize(args);
if (kw=="load_instrument") { if (kw=="load_instrument") {
//args.erase(std::remove(str.begin(), str.end(), '\"'), str.end()); try {
load_instrument(tokens[0].c_str()); std::lock_guard<SpinMutex> lock { processMutex };
load_instrument(tokens[0].c_str());
} catch (...) {
std::cout << "ERROR: Can't load instrument!\n";
}
} }
else if (kw=="set_oversampling") { else if (kw=="set_oversampling") {
try { try {
std::lock_guard<SpinMutex> lock { processMutex };
synth.setOversamplingFactor(stoi(args)); synth.setOversamplingFactor(stoi(args));
} catch (...) { } catch (...) {
std::cout << "ERROR: Can't set oversampling!\n"; std::cout << "ERROR: Can't set oversampling!\n";
@ -242,6 +247,7 @@ void cli_thread_proc() {
} }
else if (kw=="set_preload_size") { else if (kw=="set_preload_size") {
try { try {
std::lock_guard<SpinMutex> lock { processMutex };
synth.setPreloadSize(stoi(args)); synth.setPreloadSize(stoi(args));
} catch (...) { } catch (...) {
std::cout << "ERROR: Can't set preload size!\n"; std::cout << "ERROR: Can't set preload size!\n";
@ -249,6 +255,7 @@ void cli_thread_proc() {
} }
else if (kw=="set_voices") { else if (kw=="set_voices") {
try { try {
std::lock_guard<SpinMutex> lock { processMutex };
synth.setNumVoices(stoi(args)); synth.setNumVoices(stoi(args));
} catch (...) { } catch (...) {
std::cout << "ERROR: Can't set num of voices!\n"; std::cout << "ERROR: Can't set num of voices!\n";