diff options
author | cbdev <cb@cbcdn.com> | 2020-01-12 17:34:14 +0100 |
---|---|---|
committer | cbdev <cb@cbcdn.com> | 2020-01-12 17:34:14 +0100 |
commit | 78b21a9ac3f975f35ec7b61108531e1495eb91c0 (patch) | |
tree | f41cfc78f3392d501293c3afdd7b42111c863615 /backends/ola.cpp | |
parent | 0a696be5af7db63c1c7354518c839d8543f1ba25 (diff) | |
download | midimonster-78b21a9ac3f975f35ec7b61108531e1495eb91c0.tar.gz midimonster-78b21a9ac3f975f35ec7b61108531e1495eb91c0.tar.bz2 midimonster-78b21a9ac3f975f35ec7b61108531e1495eb91c0.zip |
Rework instance creation
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; |