diff options
author | cbdev <cb@cbcdn.com> | 2019-12-11 23:24:23 +0100 |
---|---|---|
committer | cbdev <cb@cbcdn.com> | 2019-12-11 23:24:23 +0100 |
commit | 9624d46436576b415c639ea7390012cdd95c88f7 (patch) | |
tree | fb3aadbaf01fcee5da8ecdb8355ff191341b666d /backends/sacn.c | |
parent | 48e12201f5c57cda581bc0c713d99da6524c49a8 (diff) | |
parent | f6d6eefe9bb9934f4fa3e665734d746f02471cdb (diff) | |
download | midimonster-9624d46436576b415c639ea7390012cdd95c88f7.tar.gz midimonster-9624d46436576b415c639ea7390012cdd95c88f7.tar.bz2 midimonster-9624d46436576b415c639ea7390012cdd95c88f7.zip |
Merge branch 'master' into rtpmidi
Diffstat (limited to 'backends/sacn.c')
-rw-r--r-- | backends/sacn.c | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/backends/sacn.c b/backends/sacn.c index edb648d..ef422e8 100644 --- a/backends/sacn.c +++ b/backends/sacn.c @@ -171,6 +171,7 @@ static int sacn_configure_instance(instance* inst, char* option, char* value){ } else if(!strcmp(option, "unicast")){ data->unicast_input = strtoul(value, NULL, 10); + return 0; } fprintf(stderr, "Unknown configuration option %s for sACN backend\n", option); @@ -530,10 +531,9 @@ static int sacn_handle(size_t num, managed_fd* fds){ return 0; } -static int sacn_start(){ - size_t n, u, p; +static int sacn_start(size_t n, instance** inst){ + size_t u, p; int rv = 1; - instance** inst = NULL; sacn_instance_data* data = NULL; sacn_instance_id id = { .label = 0 @@ -543,17 +543,6 @@ static int sacn_start(){ }; struct sockaddr_in* dest_v4 = NULL; - //fetch all instances - if(mm_backend_instances(BACKEND_NAME, &n, &inst)){ - fprintf(stderr, "Failed to fetch instance list\n"); - return 1; - } - - if(!n){ - free(inst); - return 0; - } - if(!global_cfg.fds){ fprintf(stderr, "Failed to start sACN backend: no descriptors bound\n"); free(inst); @@ -624,23 +613,15 @@ static int sacn_start(){ rv = 0; bail: - free(inst); return rv; } -static int sacn_shutdown(){ - size_t n, p; - instance** inst = NULL; - - if(mm_backend_instances(BACKEND_NAME, &n, &inst)){ - fprintf(stderr, "Failed to fetch instance list\n"); - return 1; - } +static int sacn_shutdown(size_t n, instance** inst){ + size_t p; for(p = 0; p < n; p++){ free(inst[p]->impl); } - free(inst); for(p = 0; p < global_cfg.fds; p++){ close(global_cfg.fd[p].fd); |