1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
--- a/unixinput.c
+++ b/unixinput.c
@@ -371,12 +371,15 @@
"(C) 1996 by Thomas Sailer HB9JNX/AE4WA\n"
" -t <type> : input file type (any other type than raw requires sox)\n"
" -a <demod> : add demodulator\n"
-" -s <demod> : subtract demodulator\n";
+" -s <demod> : subtract demodulator\n"
+" -v <num> : verbosity level (0-10)\n"
+" -q : quiet output messages\n";
int main(int argc, char *argv[])
{
int c;
int errflg = 0;
+ int quiet = 0;
int i;
char **itype;
int mask_first = 1;
@@ -384,17 +387,16 @@
unsigned int overlap = 0;
char *input_type = "hw";
- fprintf(stdout, "multimod (C) 1996/1997 by Tom Sailer HB9JNX/AE4WA\n"
- "available demodulators:");
- for (i = 0; i < NUMDEMOD; i++)
- fprintf(stdout, " %s", dem[i]->name);
- fprintf(stdout, "\n");
- while ((c = getopt(argc, argv, "t:a:s:v:")) != EOF) {
+ while ((c = getopt(argc, argv, "t:a:s:v:q")) != EOF) {
switch (c) {
case '?':
errflg++;
break;
+ case 'q':
+ quiet++;
+ break;
+
case 'v':
verbose_level = strtoul(optarg, 0, 0);
break;
@@ -446,17 +448,33 @@
}
}
+
+ if (!quiet)
+ {
+ fprintf (stdout, "multimod (C) 1996/1997 by Tom Sailer HB9JNX/AE4WA\n"
+ "available demodulators:");
+ for (i = 0; i < NUMDEMOD; i++)
+ fprintf (stdout, " %s", dem[i]->name);
+ fprintf (stdout, "\n");
+ }
+
if (errflg) {
(void)fprintf(stderr, usage_str);
exit(2);
}
if (mask_first)
memset(dem_mask, 0xff, sizeof(dem_mask));
+ if (!quiet)
+ {
+ fprintf (stdout, "Enabled demodulators:");
+ }
- fprintf(stdout, "Enabled demodulators:");
for (i = 0; i < NUMDEMOD; i++)
if (MASK_ISSET(i)) {
- fprintf(stdout, " %s", dem[i]->name);
+ if (!quiet)
+ {
+ fprintf (stdout, " %s", dem[i]->name);
+ }
memset(dem_st+i, 0, sizeof(dem_st[i]));
dem_st[i].dem_par = dem[i];
if (dem[i]->init)
@@ -464,16 +482,24 @@
if (sample_rate == -1)
sample_rate = dem[i]->samplerate;
else if (sample_rate != dem[i]->samplerate) {
- fprintf(stdout, "\n");
- fprintf(stderr, "Error: Current sampling rate %d, "
- " demodulator \"%s\" requires %d\n",
- sample_rate, dem[i]->name, dem[i]->samplerate);
- exit(3);
- }
+
+ if (!quiet)
+ {
+ fprintf (stdout, "\n");
+ fprintf (stderr, "Error: Current sampling rate %d, "
+ " demodulator \"%s\" requires %d\n",
+ sample_rate, dem[i]->name, dem[i]->samplerate);
+ }
+
+ exit(3);
+ }
if (dem[i]->overlap > overlap)
overlap = dem[i]->overlap;
}
- fprintf(stdout, "\n");
+ if (!quiet)
+ {
+ fprintf (stdout, "\n");
+ }
if (!strcmp(input_type, "hw")) {
if ((argc - optind) >= 1)
|
