Browse Source

Rename --output-filter parameter to --no-output-filter.

no-output-filter better describes what the parameter does.
Also fix man page description. output-filter still works but
it is undocumented and kept only for backwards compatability.
Georgi Chorbadzhiyski 12 years ago
parent
commit
9e117c45d0
3 changed files with 8 additions and 7 deletions
  1. 1
    1
      README
  2. 4
    4
      tsdecrypt.1
  3. 3
    2
      tsdecrypt.c

+ 1
- 1
README View File

@@ -45,7 +45,7 @@ Output options:
45 45
                             .    -O -              (write to stdout) (default)
46 46
  -o --output-intf <addr>    | Set multicast output interface. Default: 0.0.0.0
47 47
  -t --output-ttl <ttl>      | Set multicast ttl. Default: 1
48
- -p --output-filter         | Enable or disable output filter. Default: enabled
48
+ -p --no-output-filter      | Disable output filtering. Default: enabled
49 49
  -y --output-nit-pass       | Pass through NIT.
50 50
  -w --output-eit-pass       | Pass through EIT (EPG).
51 51
  -x --output-tdt-pass       | Pass through TDT/TOT.

+ 4
- 4
tsdecrypt.1 View File

@@ -92,10 +92,10 @@ Set multicast output interface.
92 92
 \fB\-t\fR, \fB\-\-output\-ttl\fR
93 93
 Set multicast ttl. The default value is \fB1\fR.
94 94
 .TP
95
-\fB\-p\fR, \fB\-\-output\-filter\fR
96
-Enable output filtering. When output filter is enabled only PAT/PMT/SDT
97
-and data packets are left in the output. Everything else not mentioned
98
-in PMT like NIT, EIT, TDT tables and unknown pids is removed.
95
+\fB\-p\fR, \fB\-\-no\-output\-filter\fR
96
+Disable output filtering. By default the output filter is enabled and only
97
+PAT/PMT/SDT and data packets are left in the output. Everything else not
98
+mentioned in PMT like NIT, EIT, TDT tables and unknown pids is removed.
99 99
 .TP
100 100
 \fB\-y\fR, \fB\-\-output\-nit\-pass\fR
101 101
 Pass throught NIT packets when output filtering is enabled.

+ 3
- 2
tsdecrypt.c View File

@@ -121,6 +121,7 @@ static const struct option long_options[] = {
121 121
 	{ "output-intf",		required_argument, NULL, 'o' },
122 122
 	{ "output-ttl",			required_argument, NULL, 't' },
123 123
 	{ "output-filter",		no_argument,       NULL, 'p' },
124
+	{ "no-output-filter",	no_argument,       NULL, 'p' },
124 125
 	{ "output-nit-pass",	no_argument,       NULL, 'y' },
125 126
 	{ "output-eit-pass",	no_argument,       NULL, 'w' },
126 127
 	{ "output-tdt-pass",	no_argument,       NULL, 'x' },
@@ -184,7 +185,7 @@ static void show_help(struct ts *ts) {
184 185
 	printf("                            .    -O -              (write to stdout) (default)\n");
185 186
 	printf(" -o --output-intf <addr>    | Set multicast output interface. Default: %s\n", inet_ntoa(ts->output.intf));
186 187
 	printf(" -t --output-ttl <ttl>      | Set multicast ttl. Default: %d\n", ts->output.ttl);
187
-	printf(" -p --output-filter         | Enable or disable output filter. Default: %s\n", ts->pid_filter ? "enabled" : "disabled");
188
+	printf(" -p --no-output-filter      | Disable output filtering. Default: %s\n", ts->pid_filter ? "enabled" : "disabled");
188 189
 	printf(" -y --output-nit-pass       | Pass through NIT.\n");
189 190
 	printf(" -w --output-eit-pass       | Pass through EIT (EPG).\n");
190 191
 	printf(" -x --output-tdt-pass       | Pass through TDT/TOT.\n");
@@ -320,7 +321,7 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
320 321
 				ts->output.ttl = atoi(optarg);
321 322
 				break;
322 323
 			case 'p':
323
-				ts->pid_filter = !ts->pid_filter;
324
+				ts->pid_filter = 0;
324 325
 				break;
325 326
 			case 'y':
326 327
 				ts->nit_passthrough = !ts->nit_passthrough;

Loading…
Cancel
Save