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/winmidi.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/winmidi.c')
| -rw-r--r-- | backends/winmidi.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/backends/winmidi.c b/backends/winmidi.c index 790257b..090e438 100644 --- a/backends/winmidi.c +++ b/backends/winmidi.c @@ -440,10 +440,9 @@ static int winmidi_match_output(char* prefix){ return -1; } -static int winmidi_start(){ - size_t n = 0, p; +static int winmidi_start(size_t n, instance** inst){ + size_t p; int device, rv = -1; - instance** inst = NULL; winmidi_instance_data* data = NULL; struct sockaddr_storage sockadd = { 0 @@ -453,18 +452,6 @@ static int winmidi_start(){ char* error = NULL; DBGPF("winmidi main thread ID is %ld\n", GetCurrentThreadId()); - //fetch all instances - if(mm_backend_instances(BACKEND_NAME, &n, &inst)){ - fprintf(stderr, "Failed to fetch instance list\n"); - return 1; - } - - //no instances, we're done - if(!n){ - free(inst); - return 0; - } - //output device list if requested if(backend_config.list_devices){ winmidi_match_input(NULL); @@ -552,20 +539,13 @@ static int winmidi_start(){ rv = 0; bail: - free(inst); return rv; } -static int winmidi_shutdown(){ - size_t n, u; - instance** inst = NULL; +static int winmidi_shutdown(size_t n, instance** inst){ + size_t u; winmidi_instance_data* data = NULL; - if(mm_backend_instances(BACKEND_NAME, &n, &inst)){ - fprintf(stderr, "Failed to fetch instance list\n"); - return 1; - } - for(u = 0; u < n; u++){ data = (winmidi_instance_data*) inst[u]->impl; free(data->read); @@ -586,7 +566,6 @@ static int winmidi_shutdown(){ } } - free(inst); closesocket(backend_config.socket_pair[0]); closesocket(backend_config.socket_pair[1]); |