diff options
| author | cbdev <cb@cbcdn.com> | 2020-03-08 17:12:03 +0100 |
|---|---|---|
| committer | cbdev <cb@cbcdn.com> | 2020-03-08 17:12:03 +0100 |
| commit | e0000797c80789d9d4559bb5264b982c187e1137 (patch) | |
| tree | 746a063886aa0a3e51a21ce83bc8e2189d6adcd9 /backends/ola.cpp | |
| parent | 8558c3acef273833d7366e1af3659514fff9c942 (diff) | |
| parent | 5f4b349aff49be0a5f6895631a93c47fcafcff93 (diff) | |
| download | midimonster-e0000797c80789d9d4559bb5264b982c187e1137.tar.gz midimonster-e0000797c80789d9d4559bb5264b982c187e1137.tar.bz2 midimonster-e0000797c80789d9d4559bb5264b982c187e1137.zip | |
Merge branch 'master' into debian/master
Diffstat (limited to 'backends/ola.cpp')
| -rw-r--r-- | backends/ola.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/backends/ola.cpp b/backends/ola.cpp index 09d68c9..106dbd5 100644 --- a/backends/ola.cpp +++ b/backends/ola.cpp @@ -40,21 +40,15 @@ static int ola_configure(char* option, char* value){ return 1; } -static instance* ola_instance(){ - ola_instance_data* data = NULL; - instance* inst = mm_instance(); - if(!inst){ - return NULL; - } - - data = (ola_instance_data*)calloc(1, sizeof(ola_instance_data)); +static int ola_instance(instance* inst){ + ola_instance_data* data = (ola_instance_data*) calloc(1, sizeof(ola_instance_data)); if(!data){ LOG("Failed to allocate memory"); - return NULL; + return 1; } inst->impl = data; - return inst; + return 0; } static int ola_configure_instance(instance* inst, char* option, char* value){ @@ -188,7 +182,7 @@ static void ola_data_receive(unsigned int universe, const ola::DmxBuffer& ola_dm else{ chan = mm_channel(inst, p, 0); } - + if(!chan){ LOGPF("Active channel %" PRIsize_t " on %s not known to core", p, inst->name); return; |