diff options
author | Andreas Eversberg <jolly@eversberg.eu> | 2017-01-13 07:28:31 +0100 |
---|---|---|
committer | Andreas Eversberg <jolly@eversberg.eu> | 2017-02-18 21:00:58 +0100 |
commit | 2d8d7e62c1fc902a8495610f335c6e65cc1003d4 (patch) | |
tree | 2b6b9d6c5de26bd4eab6490c9825fd97eb6fd3ad /src/anetz | |
parent | bc028cd4d3b24f1e632a04bd0eebcb48b0c27ea2 (diff) |
Use global init/cleanup function
Diffstat (limited to 'src/anetz')
-rw-r--r-- | src/anetz/main.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/anetz/main.c b/src/anetz/main.c index a6fcfcb..134807d 100644 --- a/src/anetz/main.c +++ b/src/anetz/main.c @@ -166,20 +166,11 @@ int main(int argc, char *argv[]) print_image(); /* init functions */ - if (use_mncc_sock) { - rc = mncc_init("/tmp/bsc_mncc"); - if (rc < 0) { - fprintf(stderr, "Failed to setup MNCC socket. Quitting!\n"); - return -1; - } - } + rc = init_common(station_id, 5); + if (rc < 0) + goto fail; dsp_init(); anetz_init(); - rc = call_init(station_id, call_audiodev, samplerate, latency, 5, loopback); - if (rc < 0) { - fprintf(stderr, "Failed to create call control instance. Quitting!\n"); - goto fail; - } /* create transceiver instance */ for (i = 0; i < num_kanal; i++) { @@ -195,9 +186,7 @@ int main(int argc, char *argv[]) fail: /* cleanup functions */ - call_cleanup(); - if (use_mncc_sock) - mncc_exit(); + cleanup_common(); /* destroy transceiver instance */ while (sender_head) |