aboutsummaryrefslogtreecommitdiffhomepage
path: root/backends/osc.c
diff options
context:
space:
mode:
authorcbdev <cb@cbcdn.com>2020-03-08 17:12:03 +0100
committercbdev <cb@cbcdn.com>2020-03-08 17:12:03 +0100
commite0000797c80789d9d4559bb5264b982c187e1137 (patch)
tree746a063886aa0a3e51a21ce83bc8e2189d6adcd9 /backends/osc.c
parent8558c3acef273833d7366e1af3659514fff9c942 (diff)
parent5f4b349aff49be0a5f6895631a93c47fcafcff93 (diff)
downloadmidimonster-e0000797c80789d9d4559bb5264b982c187e1137.tar.gz
midimonster-e0000797c80789d9d4559bb5264b982c187e1137.tar.bz2
midimonster-e0000797c80789d9d4559bb5264b982c187e1137.zip
Merge branch 'master' into debian/master
Diffstat (limited to 'backends/osc.c')
-rw-r--r--backends/osc.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/backends/osc.c b/backends/osc.c
index 7b9a5a5..754c290 100644
--- a/backends/osc.c
+++ b/backends/osc.c
@@ -562,21 +562,16 @@ static int osc_configure_instance(instance* inst, char* option, char* value){
return 1;
}
-static instance* osc_instance(){
- instance* inst = mm_instance();
- if(!inst){
- return NULL;
- }
-
+static int osc_instance(instance* inst){
osc_instance_data* data = calloc(1, sizeof(osc_instance_data));
if(!data){
LOG("Failed to allocate memory");
- return NULL;
+ return 1;
}
data->fd = -1;
inst->impl = data;
- return inst;
+ return 0;
}
static channel* osc_map_channel(instance* inst, char* spec, uint8_t flags){