Prepare for NMT: Fixes and improvements at common code

src/bnetz/main.c

@@ -29,10 +29,12 @@
 #include "../common/call.h"
 #include "../common/mncc_sock.h"
 #include "../common/main.h"
+#include "../common/freiton.h"
+#include "../common/besetztton.h"
 #include "bnetz.h"
 #include "dsp.h"
 #include "image.h"
-#include "ansage-27.h"
+#include "ansage.h"
 
 int gfs = 2;
 const char *pilot = "tone";
@@ -40,7 +42,7 @@ double lossdetect = 0;
 
 void print_help(const char *arg0)
 {
-	print_help_common(arg0);
+	print_help_common(arg0, "");
 	/*      -                                                                             - */
 	printf(" -g --gfs <gruppenfreisignal>\n");
 	printf("        Gruppenfreisignal\" 1..9 | 19 | 10..18 (default = '%d')\n", gfs);
@@ -109,6 +111,11 @@ int main(int argc, char *argv[])
 	int skip_args;
 	const char *station_id = "";
 
+	/* init common tones */
+	init_freiton();
+	init_besetzton();
+	init_ansage();
+
 	skip_args = handle_options(argc, argv);
 	argc -= skip_args;
 	argv += skip_args;
@@ -138,10 +145,9 @@ int main(int argc, char *argv[])
 			return -1;
 		}
 	}
-	init_ansage_27();
 	dsp_init();
 	bnetz_init();
-	rc = call_init(station_id, call_sounddev, samplerate, latency, loopback);
+	rc = call_init(station_id, call_sounddev, samplerate, latency, 5, loopback);
 	if (rc < 0) {
 		fprintf(stderr, "Failed to create call control instance. Quitting!\n");
 		goto fail;