Browse Source

Reorder command line parameters in the help text.

Georgi Chorbadzhiyski 12 years ago
parent
commit
f8f8612031
2 changed files with 19 additions and 15 deletions
  1. 11
    8
      README
  2. 8
    7
      tsdecrypt.c

+ 11
- 8
README View File

@@ -18,17 +18,14 @@ from http://www.videolan.org/developers/libdvbcsa.html
18 18
 Documentation
19 19
 =============
20 20
 tsdecrypt is controlled using command line parameters. For more information
21
-about the parameters see the man page.
21
+about the parameters see the man page. Here is a list of supported command
22
+line parameters:
22 23
 
23
-Daemon options:
24
+Main options:
24 25
  -i --ident <server>        | Format PROVIDER/CHANNEL. Default: empty
25 26
  -d --daemon <pidfile>      | Daemonize program and write pid file.
26 27
  -N --notify-program <prg>  | Execute <prg> to report events. Default: empty
27 28
 
28
- -S --syslog                | Log messages using syslog.
29
- -l --syslog-host <host>    | Syslog server address. Default: disabled
30
- -L --syslog-port <port>    | Syslog server port. Default: 514
31
-
32 29
 Input options:
33 30
  -I --input <source>        | Where to read from. File or multicast address.
34 31
                             .    -I 224.0.0.1:5000 (multicast receive)
@@ -46,9 +43,9 @@ Output options:
46 43
                             .    -O -              (write to stdout) (default)
47 44
  -o --output-intf <addr>    | Set multicast output interface. Default: 0.0.0.0
48 45
  -t --output-ttl <ttl>      | Set multicast ttl. Default: 1
49
- -g --output-tos <tos>      | Set TOS value of output packets. Default: none
50 46
  -r --output-rtp            | Enable RTP output.
51 47
  -k --output-rtp-ssrc <id>  | Set RTP SSRC. Default: 0
48
+ -g --output-tos <tos>      | Set TOS value of output packets. Default: none
52 49
  -p --no-output-filter      | Disable output filtering. Default: enabled
53 50
  -y --output-nit-pass       | Pass through NIT.
54 51
  -w --output-eit-pass       | Pass through EIT (EPG).
@@ -89,7 +86,11 @@ ECM options:
89 86
  -J --cw-warn-time <sec>    | Warn if no valid code word has been received.
90 87
                             .   Set <sec> to 0 to disable. Default: 60 sec
91 88
 
92
-Misc options:
89
+Logging options:
90
+ -S --syslog                | Log messages using syslog.
91
+ -l --syslog-host <host>    | Syslog server address. Default: disabled
92
+ -L --syslog-port <port>    | Syslog server port. Default: 514
93
+ -F --log-file <filename>   | Log to file <filename>.
93 94
  -D --debug <level>         | Message debug level.
94 95
                             .    0 = default messages
95 96
                             .    1 = show PSI tables
@@ -97,6 +98,8 @@ Misc options:
97 98
                             .    3 = show duplicate ECMs
98 99
                             .    4 = packet debug
99 100
                             .    5 = packet debug + packet dump
101
+
102
+Misc options:
100 103
  -j --pid-report            | Report how much packets were received.
101 104
  -b --bench                 | Benchmark decrypton.
102 105
  -h --help                  | Show help screen.

+ 8
- 7
tsdecrypt.c View File

@@ -178,16 +178,11 @@ static void show_help(struct ts *ts) {
178 178
 	printf("\n");
179 179
 	printf("	Usage: " PROGRAM_NAME " [opts]\n");
180 180
 	printf("\n");
181
-	printf("Daemon options:\n");
181
+	printf("Main options:\n");
182 182
 	printf(" -i --ident <server>        | Format PROVIDER/CHANNEL. Default: empty\n");
183 183
 	printf(" -d --daemon <pidfile>      | Daemonize program and write pid file.\n");
184 184
 	printf(" -N --notify-program <prg>  | Execute <prg> to report events. Default: empty\n");
185 185
 	printf("\n");
186
-	printf(" -S --syslog                | Log messages using syslog.\n");
187
-	printf(" -l --syslog-host <host>    | Syslog server address. Default: disabled\n");
188
-	printf(" -L --syslog-port <port>    | Syslog server port. Default: %d\n", ts->syslog_port);
189
-	printf(" -F --log-file <filename>   | Log to file <filename>.\n");
190
-	printf("\n");
191 186
 	printf("Input options:\n");
192 187
 	printf(" -I --input <source>        | Where to read from. File or multicast address.\n");
193 188
 	printf("                            .    -I 224.0.0.1:5000 (multicast receive)\n");
@@ -248,7 +243,11 @@ static void show_help(struct ts *ts) {
248 243
 	printf(" -J --cw-warn-time <sec>    | Warn if no valid code word has been received.\n");
249 244
 	printf("                            .   Set <sec> to 0 to disable. Default: %d sec\n", ts->cw_warn_sec);
250 245
 	printf("\n");
251
-	printf("Misc options:\n");
246
+	printf("Logging options:\n");
247
+	printf(" -S --syslog                | Log messages using syslog.\n");
248
+	printf(" -l --syslog-host <host>    | Syslog server address. Default: disabled\n");
249
+	printf(" -L --syslog-port <port>    | Syslog server port. Default: %d\n", ts->syslog_port);
250
+	printf(" -F --log-file <filename>   | Log to file <filename>.\n");
252 251
 	printf(" -D --debug <level>         | Message debug level.\n");
253 252
 	printf("                            .    0 = default messages\n");
254 253
 	printf("                            .    1 = show PSI tables\n");
@@ -256,6 +255,8 @@ static void show_help(struct ts *ts) {
256 255
 	printf("                            .    3 = show duplicate ECMs\n");
257 256
 	printf("                            .    4 = packet debug\n");
258 257
 	printf("                            .    5 = packet debug + packet dump\n");
258
+	printf("\n");
259
+	printf("Misc options:\n");
259 260
 	printf(" -j --pid-report            | Report how much packets were received.\n");
260 261
 	printf(" -b --bench                 | Benchmark decrypton.\n");
261 262
 	printf(" -h --help                  | Show help screen.\n");

Loading…
Cancel
Save