aboutsummaryrefslogtreecommitdiffhomepage
path: root/backends/ola.cpp
diff options
context:
space:
mode:
authorcbdev <cb@cbcdn.com>2019-12-11 23:02:22 +0100
committercbdev <cb@cbcdn.com>2019-12-11 23:02:22 +0100
commitf65fb8baaba285f5ff4b02af111420ba4479f5d9 (patch)
tree39f9a832ed220270d37d15edc50433635ed9bfe1 /backends/ola.cpp
parente60eff52920cf063e7625344764521a791c8be3e (diff)
downloadmidimonster-f65fb8baaba285f5ff4b02af111420ba4479f5d9.tar.gz
midimonster-f65fb8baaba285f5ff4b02af111420ba4479f5d9.tar.bz2
midimonster-f65fb8baaba285f5ff4b02af111420ba4479f5d9.zip
Simplify plugin_start API
Diffstat (limited to 'backends/ola.cpp')
-rw-r--r--backends/ola.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/backends/ola.cpp b/backends/ola.cpp
index c13e8f9..088c20c 100644
--- a/backends/ola.cpp
+++ b/backends/ola.cpp
@@ -220,9 +220,8 @@ static void ola_register_callback(const std::string &error) {
}
}
-static int ola_start(){
- size_t n, u, p;
- instance** inst = NULL;
+static int ola_start(size_t n, instance** inst){
+ size_t u, p;
ola_instance_data* data = NULL;
ola_select = new ola::io::SelectServer();
@@ -255,12 +254,6 @@ static int ola_start(){
goto bail;
}
- //this should not happen anymore (backends without instances are not started anymore)
- if(!n){
- free(inst);
- return 0;
- }
-
for(u = 0; u < n; u++){
data = (ola_instance_data*) inst[u]->impl;
inst[u]->ident = data->universe_id;
@@ -277,10 +270,8 @@ static int ola_start(){
//run the ola select implementation to run all commands
ola_select->RunOnce();
- free(inst);
return 0;
bail:
- free(inst);
delete ola_client;
ola_client = NULL;
delete ola_select;