Rename configuration parameters.

  --list-vinputs   ->  --list-inputs
  --list-voutputs  ->  --list-outputs
  --list-moutputs  ->  --list-monitor
  --vi-X           ->  --in-X
  --vo-X           ->  --out-X
  --mo-X           ->  --mon-X
  --se-X           ->  --ser-X

ChangeLog

@@ -3,7 +3,15 @@ xxxx-xx-xx : Version -next
  * Add support for --list-proc-units and --list-frames.
  * Add support for setting device friendly name using --set-name option.
  * Add support for routing inputs to outputs/mon_ports using
-  --vi-output and --vi-monitor parameters.
+   --vi-output and --vi-monitor parameters.
+ * Rename configuration parameters (the old ones continue to work):
+   --list-vinputs   ->  --list-inputs
+   --list-voutputs  ->  --list-outputs
+   --list-moutputs  ->  --list-monitor
+   --vi-X           ->  --in-X
+   --vo-X           ->  --out-X
+   --mo-X           ->  --mon-X
+   --se-X           ->  --ser-X
 
 2014-12-03 : Version 1.0
  * Add missing documentation for --list-moutputs parameter.

README

@@ -52,53 +52,53 @@ Commands:
                             . the device to the current configuration.
 
  --list-device              | Display device info.
- --list-vinputs             | List device video inputs.
- --list-voutputs            | List device video outputs.
- --list-moutputs            | List device monitoring outputs.
+ --list-inputs              | List device input ports.
+ --list-outputs             | List device output ports.
+ --list-monitor             | List device monitoring outputs.
  --list-serial              | List device serial ports.
  --list-proc-units          | List device processing units.
  --list-frames              | List device frame buffers.
 
  --set-name <name>          | Set the device "friendly name".
 
-Video inputs configuration:
- --vi-name <in_X> <name>    | Set video input port X name.
- --vi-output <in_X> <out_Y> | Route video input X to output Y.
- --vi-monitor <in_X> <mout_Y> | Route video input X to mon port Y.
+Inputs configuration:
+ --in-name <in_X> <name>       | Set input port X name.
+ --in-output <in_X> <out_Y>    | Route input X to output Y.
+ --in-monitor <in_X> <mout_Y>  | Route input X to monitor port Y.
 
-Video outputs configuration:
- --vo-name <out_X> <name>   | Set video output port X name.
- --vo-input <out_X> <in_Y>  | Connect video output X to input Y.
- --vo-lock <out_X>          | Lock output port X.
- --vo-unlock <out_X>        | Unlock output port X.
+Outputs configuration:
+ --out-name <out_X> <name>     | Set output port X name.
+ --out-input <out_X> <in_Y>    | Connect output X to input Y.
+ --out-lock <out_X>            | Lock output port X.
+ --out-unlock <out_X>          | Unlock output port X.
 
 Monitoring outputs configuration:
- --mo-name <mout_X> <name>  | Set monitoring port X name.
- --mo-input <mout_X> <in_Y> | Connect monitoring X to input Y.
- --mo-lock <mout_X>         | Lock monitoring port X.
- --mo-unlock <mout_X>       | Unlock monitoring port X.
+ --mon-name <mout_X> <name>    | Set monitoring port X name.
+ --mon-input <mout_X> <in_Y>   | Connect monitoring X to input Y.
+ --mon-lock <mout_X>           | Lock monitoring port X.
+ --mon-unlock <mout_X>         | Unlock monitoring port X.
 
 Serial ports configuration:
- --se-name <ser_X> <name>   | Set serial port X name.
- --se-connect <ser_X> <ser_Y> | Connect serial X to serial Y.
- --se-clear <ser_X>         | Disconnect serial port X from serial Y.
- --se-lock <ser_X>          | Lock serial port X.
- --se-unlock <ser_X>        | Unlock serial port X.
- --se-dir <ser_X> <dir>     | Set serial port X direction.
-                            . <dir> can be 'auto', 'in' or 'out'.
+ --ser-name <ser_X> <name>     | Set serial port X name.
+ --ser-connect <ser_X> <ser_Y> | Connect serial X to serial Y.
+ --ser-clear <ser_X>           | Disconnect serial port X from serial Y.
+ --ser-lock <ser_X>            | Lock serial port X.
+ --ser-unlock <ser_X>          | Unlock serial port X.
+ --ser-dir <ser_X> <dir>       | Set serial port X direction.
+                               . <dir> can be 'auto', 'in' or 'out'.
 
 Processing units configuration:
- --pu-input <pu_X> <in_Y>   | Connect processing unit X to input Y.
- --pu-clear <pu_X>          | Disconnect unit X from input Y.
- --pu-lock <pu_X>           | Lock processing unit X.
- --pu-unlock <pu_X>         | Unlock processing unit X.
+ --pu-input <pu_X> <in_Y>      | Connect processing unit X to input Y.
+ --pu-clear <pu_X>             | Disconnect unit X from input Y.
+ --pu-lock <pu_X>              | Lock processing unit X.
+ --pu-unlock <pu_X>            | Unlock processing unit X.
 
 Frames configuration:
- --fr-name <fr_X> <name>    | Set frame X name.
- --fr-output <fr_X> <out_Y> | Output frame X to output Y.
- --fr-clear <fr_X>          | Stop outputing frame X to the output.
- --fr-lock <fr_X>           | Lock frame X.
- --fr-unlock <rf_X>         | Unlock frame X.
+ --fr-name <fr_X> <name>       | Set frame X name.
+ --fr-output <fr_X> <out_Y>    | Output frame X to output Y.
+ --fr-clear <fr_X>             | Stop outputing frame X to the output.
+ --fr-lock <fr_X>              | Lock frame X.
+ --fr-unlock <rf_X>            | Unlock frame X.
 
 Misc options:
  -T --test-input <file>     | Read commands from <file>.
@@ -128,36 +128,36 @@ Example usage
 
  # Rename video output
 
-   videohubctrl -h sdi --vo-name 8 "Output 8 - test"
-   videohubctrl -h sdi --vo-name "Output 8 - test" "Output 8"
+   videohubctrl -h sdi --out-name 8 "Output 8 - test"
+   videohubctrl -h sdi --out-name "Output 8 - test" "Output 8"
 
 
  # Rename video input
 
-   videohubctrl -h sdi --vi-name 4 "Windows 4 HD"
-   videohubctrl -h sdi --vi-name "Windows 4 HD" "CPlay4"
+   videohubctrl -h sdi --in-name 4 "Windows 4 HD"
+   videohubctrl -h sdi --in-name "Windows 4 HD" "CPlay4"
 
 
  # Lock and then unlock output 16 (unlock assumes that the port is
  # named Output 16). The host name is set via env variable.
 
    export VIDEOHUB_HOST=sdi
-   videohubctrl --vo-lock 16
-   videohubctrl --vo-unlock "Output 16"
+   videohubctrl --out-lock 16
+   videohubctrl --out-unlock "Output 16"
 
 
  # Set two outputs to receive from the same input using port names
 
-   videohubctrl -h sdi --vo-input "Output 8" "Windows 4 HD"
-   videohubctrl -h sdi --vo-input "Output 7" "Windows 4 HD"
+   videohubctrl -h sdi --out-input "Output 8" "Windows 4 HD"
+   videohubctrl -h sdi --out-input "Output 7" "Windows 4 HD"
 
 
  # Set one input to go out two outputs and two monitoring ports
 
-   videohubctrl -h sdi --vi-output  "Windows 4 HD" "Output 8" \
-                       --vi-output  "Windows 4 HD" "Output 7" \
-                       --vi-monitor "Windows 4 HD" "Monitor 1" \
-                       --vi-monitor "Windows 4 HD" "Monitor 2"
+   videohubctrl -h sdi --in-output  "Windows 4 HD" "Output 8" \
+                       --in-output  "Windows 4 HD" "Output 7" \
+                       --in-monitor "Windows 4 HD" "Monitor 1" \
+                       --in-monitor "Windows 4 HD" "Monitor 2"
 
 
  # Run several commands at once
@@ -167,16 +167,16 @@ Example usage
  # Lock output 5
 
    videohubctrl --host sdi \
-                --vi-name 11 "Test input" \
-                --vi-name 12 "Playout input" \
-                --vo-name 5 "Encoder h264" \
-                --vo-input 5 12 \
-                --vo-lock 5
+                --in-name 11 "Test input" \
+                --in-name 12 "Playout input" \
+                --out-name 5 "Encoder h264" \
+                --out-input 5 12 \
+                --out-lock 5
 
  # This fails. It tries to use name that is not previously configured.
 
-   videohubctrl -h sdi --vo-name 1 "Test output" \
-                       --vo-name "Test output" "Other name"
+   videohubctrl -h sdi --out-name 1 "Test output" \
+                       --out-name "Test output" "Other name"
 
 
 Example output

cmd.c

@@ -54,79 +54,79 @@ struct videohub_commands videohub_commands[NUM_COMMANDS] = {
 	[CMD_INPUT_LABELS]         = { .cmd = CMD_INPUT_LABELS        , .type = PARSE_LABEL,
 		.ports1 = OFS(inputs),
 		.port_id1 = "video input",
-		.opt_prefix = "vi",
+		.opt_prefix = "in",
 	},
 	[CMD_OUTPUT_LABELS]        = { .cmd = CMD_OUTPUT_LABELS       , .type = PARSE_LABEL,
 		.ports1 = OFS(outputs),
 		.port_id1 = "video output",
-		.opt_prefix = "vo",
+		.opt_prefix = "out",
 	},
 	[CMD_VIDEO_OUTPUT_LOCKS]   = { .cmd = CMD_VIDEO_OUTPUT_LOCKS  , .type = PARSE_LOCK,
 		.ports1 = OFS(outputs),
 		.port_id1 = "video output",
-		.opt_prefix = "vo",
+		.opt_prefix = "out",
 	},
 	[CMD_VIDEO_OUTPUT_ROUTING] = { .cmd = CMD_VIDEO_OUTPUT_ROUTING, .type = PARSE_ROUTE,
 		.ports1 = OFS(outputs),
 		.ports2 = OFS(inputs),
 		.port_id1 = "video output",
 		.port_id2 = "video input",
-		.opt_prefix = "vo",
+		.opt_prefix = "out",
 	},
 	[CMD_VIDEO_INPUT_STATUS]   = { .cmd = CMD_VIDEO_INPUT_STATUS  , .type = PARSE_STATUS,
 		.ports1 = OFS(inputs),
 		.port_id1 = "video input",
-		.opt_prefix = "vi",
+		.opt_prefix = "in",
 	},
 	[CMD_VIDEO_OUTPUT_STATUS]  = { .cmd = CMD_VIDEO_OUTPUT_STATUS , .type = PARSE_STATUS,
 		.ports1 = OFS(outputs),
 		.port_id1 = "video output",
-		.opt_prefix = "vo",
+		.opt_prefix = "out",
 	},
 	[CMD_MONITORING_OUTPUT_LABELS]  = { .cmd = CMD_MONITORING_OUTPUT_LABELS , .type = PARSE_LABEL,
 		.ports1 = OFS(mon_outputs),
 		.port_id1 = "monitoring output",
-		.opt_prefix = "mo",
+		.opt_prefix = "mon",
 	},
 	[CMD_MONITORING_OUTPUT_LOCKS]   = { .cmd = CMD_MONITORING_OUTPUT_LOCKS  , .type = PARSE_LOCK,
 		.ports1 = OFS(mon_outputs),
 		.port_id1 = "monitoring output",
-		.opt_prefix = "mo",
+		.opt_prefix = "mon",
 	},
 	[CMD_MONITORING_OUTPUT_ROUTING] = { .cmd = CMD_MONITORING_OUTPUT_ROUTING, .type = PARSE_ROUTE,
 		.ports1 = OFS(mon_outputs),
 		.ports2 = OFS(inputs),
 		.port_id1 = "monitoring output",
 		.port_id2 = "video input",
-		.opt_prefix = "mo",
+		.opt_prefix = "mon",
 	},
 	[CMD_SERIAL_PORT_LABELS]  = { .cmd = CMD_SERIAL_PORT_LABELS, .type = PARSE_LABEL,
 		.ports1 = OFS(serial),
 		.port_id1 = "serial",
-		.opt_prefix = "se",
+		.opt_prefix = "ser",
 	},
 	[CMD_SERIAL_PORT_LOCKS]   = { .cmd = CMD_SERIAL_PORT_LOCKS  , .type = PARSE_LOCK,
 		.ports1 = OFS(serial),
 		.port_id1 = "serial",
-		.opt_prefix = "se",
+		.opt_prefix = "ser",
 	},
 	[CMD_SERIAL_PORT_ROUTING] = { .cmd = CMD_SERIAL_PORT_ROUTING, .type = PARSE_ROUTE,
 		.ports1 = OFS(serial),
 		.ports2 = OFS(serial),
 		.port_id1 = "serial",
 		.port_id2 = "serial",
-		.opt_prefix = "se",
+		.opt_prefix = "ser",
 		.allow_disconnect = true,
 	},
 	[CMD_SERIAL_PORT_STATUS]  = { .cmd = CMD_SERIAL_PORT_STATUS , .type = PARSE_STATUS,
 		.ports1 = OFS(serial),
 		.port_id1 = "serial",
-		.opt_prefix = "se",
+		.opt_prefix = "ser",
 	},
 	[CMD_SERIAL_PORT_DIRECTIONS] = { .cmd = CMD_SERIAL_PORT_DIRECTIONS, .type = PARSE_DIR,
 		.ports1 = OFS(serial),
 		.port_id1 = "serial",
-		.opt_prefix = "se",
+		.opt_prefix = "ser",
 	},
 	[CMD_PROCESSING_UNIT_ROUTING] = { .cmd = CMD_PROCESSING_UNIT_ROUTING, .type = PARSE_ROUTE,
 		.ports1 = OFS(proc_units),

test/run

@@ -33,38 +33,38 @@ check test/test-03 "Test --backup restore"
 
 videohubctrl --test-input test/input-00.txt \
 	--set-name "Test name" \
-	--vi-name "Windows 4 HD" "Windows 4 HighDef" \
-	--vi-output "Windows 1" "Output 15" \
-	--vi-monitor "Windows 3" "Monitor 1" \
-	--vi-name 5 "In 5" \
-	--vi-name "Input 6" "Camera 6" \
-	--vo-name "Enc1 1" "Encoder 1" \
-	--vo-name 16 Dev-Lo \
-	--vo-lock 6 \
-	--vo-lock "Output 15" \
-	--vo-unlock 12 \
-	--vo-unlock "Enc2 1" \
-	--vo-input "Output 5" "Windows 1" \
-	--vo-input 5 2 \
-	--vo-input 5 "Windows 3" \
-	--mo-name 1 "PC 1 Mon" \
-	--mo-name "Monitor 4" "Decklink" \
-	--mo-unlock 2 \
-	--mo-lock 4 \
-	--mo-name 3 "Loopback" \
-	--mo-input 3 16 \
-	--se-name 1 "Ren Ctrl 1" \
-	--se-name "Deck 3" "Ren Deck 3" \
-	--se-unlock 1 \
-	--se-lock 2 \
-	--se-input 2 1 \
-	--se-dir 6 in \
-	--se-dir 7 out \
-	--se-dir 8 out --se-dir 8 auto \
-	--se-input 4 5 \
-	--se-input 6 7 \
-	--se-clear 4 \
-	--se-clear "Serial 6" \
+	--in-name "Windows 4 HD" "Windows 4 HighDef" \
+	--in-output "Windows 1" "Output 15" \
+	--in-monitor "Windows 3" "Monitor 1" \
+	--in-name 5 "In 5" \
+	--in-name "Input 6" "Camera 6" \
+	--out-name "Enc1 1" "Encoder 1" \
+	--out-name 16 Dev-Lo \
+	--out-lock 6 \
+	--out-lock "Output 15" \
+	--out-unlock 12 \
+	--out-unlock "Enc2 1" \
+	--out-input "Output 5" "Windows 1" \
+	--out-input 5 2 \
+	--out-input 5 "Windows 3" \
+	--mon-name 1 "PC 1 Mon" \
+	--mon-name "Monitor 4" "Decklink" \
+	--mon-unlock 2 \
+	--mon-lock 4 \
+	--mon-name 3 "Loopback" \
+	--mon-input 3 16 \
+	--ser-name 1 "Ren Ctrl 1" \
+	--ser-name "Deck 3" "Ren Deck 3" \
+	--ser-unlock 1 \
+	--ser-lock 2 \
+	--ser-input 2 1 \
+	--ser-dir 6 in \
+	--ser-dir 7 out \
+	--ser-dir 8 out --ser-dir 8 auto \
+	--ser-input 4 5 \
+	--ser-input 6 7 \
+	--ser-clear 4 \
+	--ser-clear "Serial 6" \
 	--pu-clear 1 --pu-clear 3 --pu-clear 4 \
 	--pu-unlock 1 --pu-lock 1 --pu-connect 1 "Windows 4 HD" \
 	--pu-connect 4 "DPlay1" --pu-lock 4 \
@@ -79,56 +79,56 @@ grep -v ^videohub: < test/test-03.out > test/test-05.out
 sed -e 's,| L |,| O |,g' < test/test-01.ok > test/test-05.ok
 check test/test-05 "Test if --backup restored correct config."
 
-./videohubctrl --test-input test/input-00.txt --vi-name 0           "Test Input 0"   $@ &> test/test-06.out
-./videohubctrl --test-input test/input-00.txt --vi-name 18          "Test Input 18"  $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vi-name "Input 18"  "Test Input 18"  $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-name 18          "Test Output 18" $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-name "Output 18" "Test Output 18" $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vi-output "Input 22" "Output 15"     $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vi-output "Input 14" "Output 22"     $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vi-monitor "Input 22" "Monitor 3"    $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vi-monitor "Input 14" "Monitor 33"   $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-lock 18                           $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-lock "Output 18"                  $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-unlock 18                         $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-unlock "Output 18"                $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-input 0 0                         $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-input 0 18                        $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-input 18 0                        $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-input 18 18                       $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-input 1  18                       $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-input 18 1                        $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-input "Input 10" "Output 10"      $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-input "Err Output" "Input 10"     $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --vo-input "Output 10" "Err Input"     $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --mo-name 18          "Test Output 18" $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --mo-name "Output 18" "Test Output 18" $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --mo-lock 18                           $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --mo-lock "Output 18"                  $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --mo-unlock 18                         $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --mo-unlock "Output 18"                $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --se-name 18          "Test Serial 18" $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --se-name "Serial 18" "Test Serial 18" $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --se-clear 24                          $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --se-clear "Serial X"                  $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --se-connect 24 7                      $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --se-lock 18                           $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --se-lock "Serial 18"                  $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --se-unlock 18                         $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --se-unlock "Serial 18"                $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --se-dir 1 err-dir                     $@ >> test/test-06.out 2>&1
-./videohubctrl --test-input test/input-00.txt --se-dir "Serial 5" err-dir            $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --in-name 0           "Test Input 0"   $@ &> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --in-name 18          "Test Input 18"  $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --in-name "Input 18"  "Test Input 18"  $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-name 18          "Test Output 18" $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-name "Output 18" "Test Output 18" $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --in-output "Input 22" "Output 15"     $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --in-output "Input 14" "Output 22"     $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --in-monitor "Input 22" "Monitor 3"    $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --in-monitor "Input 14" "Monitor 33"   $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-lock 18                           $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-lock "Output 18"                  $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-unlock 18                         $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-unlock "Output 18"                $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-input 0 0                         $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-input 0 18                        $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-input 18 0                        $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-input 18 18                       $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-input 1  18                       $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-input 18 1                        $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-input "Input 10" "Output 10"      $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-input "Err Output" "Input 10"     $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --out-input "Output 10" "Err Input"     $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --mon-name 18          "Test Output 18" $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --mon-name "Output 18" "Test Output 18" $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --mon-lock 18                           $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --mon-lock "Output 18"                  $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --mon-unlock 18                         $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --mon-unlock "Output 18"                $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --ser-name 18          "Test Serial 18" $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --ser-name "Serial 18" "Test Serial 18" $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --ser-clear 24                          $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --ser-clear "Serial X"                  $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --ser-connect 24 7                      $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --ser-lock 18                           $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --ser-lock "Serial 18"                  $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --ser-unlock 18                         $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --ser-unlock "Serial 18"                $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --ser-dir 1 err-dir                     $@ >> test/test-06.out 2>&1
+./videohubctrl --test-input test/input-00.txt --ser-dir "Serial 5" err-dir            $@ >> test/test-06.out 2>&1
 ./videohubctrl --test-input test/input-00.txt --set-name                             $@ >> test/test-06.out 2>&1
 check test/test-06 "Test errors on commands with invalid parameters."
 
 videohubctrl --test-input test/input-00.txt --list-device $@ &> test/test-07.out
 check test/test-07 "Test --list-device option output"
 
-videohubctrl --test-input test/input-00.txt --list-vinputs $@ &> test/test-08.out
-check test/test-08 "Test --list-vinputs option output"
+videohubctrl --test-input test/input-00.txt --list-inputs $@ &> test/test-08.out
+check test/test-08 "Test --list-inputs option output"
 
-videohubctrl --test-input test/input-00.txt --list-voutputs $@ &> test/test-09.out
-check test/test-09 "Test --list-voutputs option output"
+videohubctrl --test-input test/input-00.txt --list-outputs $@ &> test/test-09.out
+check test/test-09 "Test --list-outputs option output"
 
 videohubctrl --test-input test/input-10.txt $@ &> test/test-10.out
 check test/test-10 "Test invalid protocol"
@@ -142,8 +142,8 @@ check test/test-12 "Test device-not_present check"
 videohubctrl --test-input test/input-14.txt $@ &> test/test-14.out
 check test/test-14 "Test buggy input"
 
-videohubctrl --test-input test/input-00.txt --list-moutputs $@ &> test/test-15.out
-check test/test-15 "Test --list-moutputs option output"
+videohubctrl --test-input test/input-00.txt --list-monitor $@ &> test/test-15.out
+check test/test-15 "Test --list-monitor option output"
 
 videohubctrl --test-input test/input-00.txt --list-serial $@ &> test/test-16.out
 check test/test-16 "Test --list-serial option output"

test/test-02.ok

@@ -1,49 +1,49 @@
 videohubctrl \
   --set-name "My Videohub" \
-  --vi-name   1 "Windows 1" \
-  --vi-name   2 "Windows 2" \
-  --vi-name   3 "Windows 3" \
-  --vi-name   4 "Windows 4 HD" \
-  --vi-name   5 "Input 5" \
-  --vi-name   6 "Input 6" \
-  --vi-name   7 "Input 7" \
-  --vi-name   8 "Input 8" \
-  --vi-name   9 "Input 9" \
-  --vi-name  10 "Input 10" \
-  --vi-name  11 "Input 11" \
-  --vi-name  12 "DPlay1" \
-  --vi-name  13 "DPlay2" \
-  --vi-name  14 "Input 14" \
-  --vi-name  15 "Input 15" \
-  --vi-name  16 "Loopback" \
-  --vo-name   1 "Enc1 1" \
-  --vo-name   2 "Enc1 2" \
-  --vo-name   3 "Enc1 3" \
-  --vo-name   4 "Enc1 4" \
-  --vo-name   5 "Output 5" \
-  --vo-name   6 "Output 6" \
-  --vo-name   7 "Output 7" \
-  --vo-name   8 "Output 8" \
-  --vo-name   9 "Enc2 1" \
-  --vo-name  10 "Output 10" \
-  --vo-name  11 "Output 11" \
-  --vo-name  12 "Denc" \
-  --vo-name  13 "Output 13" \
-  --vo-name  14 "Output 14" \
-  --vo-name  15 "Output 15" \
-  --vo-name  16 "Loopback" \
-  --mo-name   1 "Monitor 1" \
-  --mo-name   2 "Monitor 2" \
-  --mo-name   3 "Monitor 3" \
-  --mo-name   4 "Monitor 4" \
-  --se-name   1 "Serial Ctrl 1" \
-  --se-name   2 "Serial Ctrl 2" \
-  --se-name   3 "Deck 3" \
-  --se-name   4 "Deck 4" \
-  --se-name   5 "Serial 5" \
-  --se-name   6 "Serial 6" \
-  --se-name   7 "Serial 7" \
-  --se-name   8 "Serial 8" \
+  --in-name   1 "Windows 1" \
+  --in-name   2 "Windows 2" \
+  --in-name   3 "Windows 3" \
+  --in-name   4 "Windows 4 HD" \
+  --in-name   5 "Input 5" \
+  --in-name   6 "Input 6" \
+  --in-name   7 "Input 7" \
+  --in-name   8 "Input 8" \
+  --in-name   9 "Input 9" \
+  --in-name  10 "Input 10" \
+  --in-name  11 "Input 11" \
+  --in-name  12 "DPlay1" \
+  --in-name  13 "DPlay2" \
+  --in-name  14 "Input 14" \
+  --in-name  15 "Input 15" \
+  --in-name  16 "Loopback" \
+  --out-name   1 "Enc1 1" \
+  --out-name   2 "Enc1 2" \
+  --out-name   3 "Enc1 3" \
+  --out-name   4 "Enc1 4" \
+  --out-name   5 "Output 5" \
+  --out-name   6 "Output 6" \
+  --out-name   7 "Output 7" \
+  --out-name   8 "Output 8" \
+  --out-name   9 "Enc2 1" \
+  --out-name  10 "Output 10" \
+  --out-name  11 "Output 11" \
+  --out-name  12 "Denc" \
+  --out-name  13 "Output 13" \
+  --out-name  14 "Output 14" \
+  --out-name  15 "Output 15" \
+  --out-name  16 "Loopback" \
+  --mon-name   1 "Monitor 1" \
+  --mon-name   2 "Monitor 2" \
+  --mon-name   3 "Monitor 3" \
+  --mon-name   4 "Monitor 4" \
+  --ser-name   1 "Serial Ctrl 1" \
+  --ser-name   2 "Serial Ctrl 2" \
+  --ser-name   3 "Deck 3" \
+  --ser-name   4 "Deck 4" \
+  --ser-name   5 "Serial 5" \
+  --ser-name   6 "Serial 6" \
+  --ser-name   7 "Serial 7" \
+  --ser-name   8 "Serial 8" \
   --fr-name   1 "Frame 1" \
   --fr-name   2 "Frame 2" \
   --fr-name   3 "Frame 3" \
@@ -52,70 +52,70 @@ videohubctrl \
   --fr-name   6 "Frame 6" \
   --fr-name   7 "Frame 7" \
   --fr-name   8 "Frame 8" \
-  --vo-input   1   3 \
-  --vo-input   2   2 \
-  --vo-input   3   1 \
-  --vo-input   4   1 \
-  --vo-input   5   5 \
-  --vo-input   6   6 \
-  --vo-input   7   7 \
-  --vo-input   8   4 \
-  --vo-input   9   4 \
-  --vo-input  10  10 \
-  --vo-input  11  11 \
-  --vo-input  12  13 \
-  --vo-input  13  12 \
-  --vo-input  14  14 \
-  --vo-input  15  15 \
-  --vo-input  16  16 \
-  --mo-input   1   1 \
-  --mo-input   2   2 \
-  --mo-input   3   3 \
-  --mo-input   4   4 \
-  --se-input   1   3 \
-  --se-input   2   4 \
+  --out-input   1   3 \
+  --out-input   2   2 \
+  --out-input   3   1 \
+  --out-input   4   1 \
+  --out-input   5   5 \
+  --out-input   6   6 \
+  --out-input   7   7 \
+  --out-input   8   4 \
+  --out-input   9   4 \
+  --out-input  10  10 \
+  --out-input  11  11 \
+  --out-input  12  13 \
+  --out-input  13  12 \
+  --out-input  14  14 \
+  --out-input  15  15 \
+  --out-input  16  16 \
+  --mon-input   1   1 \
+  --mon-input   2   2 \
+  --mon-input   3   3 \
+  --mon-input   4   4 \
+  --ser-input   1   3 \
+  --ser-input   2   4 \
   --pu-input   1   4 \
   --pu-input   2   2 \
   --pu-input   4   3 \
   --fr-input   1  13 \
   --fr-input   2  14 \
   --fr-input   3  15 \
-  --se-dir   1 in \
-  --se-dir   2 auto \
-  --se-dir   3 out \
-  --se-dir   4 auto \
-  --se-dir   5 auto \
-  --se-dir   6 auto \
-  --se-dir   7 in \
-  --se-dir   8 out \
-  --vo-unlock   1 --vo-lock   1 \
-  --vo-unlock   2 --vo-lock   2 \
-  --vo-unlock   3 --vo-lock   3 \
-  --vo-unlock   4 --vo-lock   4 \
-  --vo-unlock   5 \
-  --vo-unlock   6 \
-  --vo-unlock   7 \
-  --vo-unlock   8 \
-  --vo-unlock   9 --vo-lock   9 \
-  --vo-unlock  10 \
-  --vo-unlock  11 \
-  --vo-unlock  12 --vo-lock  12 \
-  --vo-unlock  13 --vo-lock  13 \
-  --vo-unlock  14 \
-  --vo-unlock  15 \
-  --vo-unlock  16 --vo-lock  16
-  --mo-unlock   1 \
-  --mo-unlock   2 --mo-lock   2 \
-  --mo-unlock   3 --mo-lock   3 \
-  --mo-unlock   4
-  --se-unlock   1 --se-lock   1 \
-  --se-unlock   2 \
-  --se-unlock   3 --se-lock   3 \
-  --se-unlock   4 \
-  --se-unlock   5 \
-  --se-unlock   6 \
-  --se-unlock   7 \
-  --se-unlock   8
+  --ser-dir   1 in \
+  --ser-dir   2 auto \
+  --ser-dir   3 out \
+  --ser-dir   4 auto \
+  --ser-dir   5 auto \
+  --ser-dir   6 auto \
+  --ser-dir   7 in \
+  --ser-dir   8 out \
+  --out-unlock   1 --out-lock   1 \
+  --out-unlock   2 --out-lock   2 \
+  --out-unlock   3 --out-lock   3 \
+  --out-unlock   4 --out-lock   4 \
+  --out-unlock   5 \
+  --out-unlock   6 \
+  --out-unlock   7 \
+  --out-unlock   8 \
+  --out-unlock   9 --out-lock   9 \
+  --out-unlock  10 \
+  --out-unlock  11 \
+  --out-unlock  12 --out-lock  12 \
+  --out-unlock  13 --out-lock  13 \
+  --out-unlock  14 \
+  --out-unlock  15 \
+  --out-unlock  16 --out-lock  16
+  --mon-unlock   1 \
+  --mon-unlock   2 --mon-lock   2 \
+  --mon-unlock   3 --mon-lock   3 \
+  --mon-unlock   4
+  --ser-unlock   1 --ser-lock   1 \
+  --ser-unlock   2 \
+  --ser-unlock   3 --ser-lock   3 \
+  --ser-unlock   4 \
+  --ser-unlock   5 \
+  --ser-unlock   6 \
+  --ser-unlock   7 \
+  --ser-unlock   8
   --pu-unlock   1 --pu-lock   1 \
   --pu-unlock   2 \
   --pu-unlock   3 --pu-lock   3 \

videohubctrl.1

@@ -102,68 +102,68 @@ Everywhere where port needs to be set, you can use the port number or the
 port name. You can use only port names that were already configured in
 previous session. Trying to set a name and then reference it in the next
 command will fail. Using port numbers always works.
-.SH VIDEO INPUTS CONFIGURATION
+.SH INPUTS CONFIGURATION
 .PP
 .TP
-\fB\-\-vi\-name\fR <in_X> <name>
+\fB\-\-in\-name\fR <in_X> <name>
 Set video input port X name.
 .TP
-\fB\-\-vi\-output\fR <in_X> <out_Y>
+\fB\-\-in\-output\fR <in_X> <out_Y>
 Set video input X to be outputted via output Y.
 .TP
-\fB\-\-vi\-monitor\fR <in_X> <mout_Y>
+\fB\-\-in\-monitor\fR <in_X> <mout_Y>
 Set video input X to be outputted via monitoring port Y.
-.SH VIDEO OUTPUTS CONFIGURATION
+.SH OUTPUTS CONFIGURATION
 .PP
 .TP
-\fB\-\-vo\-name\fR <out_X> <name>
+\fB\-\-out\-name\fR <out_X> <name>
 Set video output port X name.
 .TP
-\fB\-\-vo\-input\fR <out_X> <in_Y>
+\fB\-\-out\-input\fR <out_X> <in_Y>
 Connect video output X to video input Y.
 .TP
-\fB\-\-vo\-lock\fR <out_X>
+\fB\-\-out\-lock\fR <out_X>
 Lock output port X.
 .TP
-\fB\-\-vo\-unlock\fR <out_X>
+\fB\-\-out\-unlock\fR <out_X>
 Unlock output port X. If the port is locked by somebody else the
 port would be forcefully unlocked.
 .SH MONITORING OUTPUTS CONFIGURATION
 .PP
 .TP
-\fB\-\-mo\-name\fR <mout_X> <name>
+\fB\-\-mon\-name\fR <mout_X> <name>
 Set monitoring output port X name.
 .TP
-\fB\-\-mo\-input\fR <mout_X> <in_Y>
+\fB\-\-mon\-input\fR <mout_X> <in_Y>
 Connect monitoring output X to video input Y.
 .TP
-\fB\-\-mo\-lock\fR <mout_X>
+\fB\-\-mon\-lock\fR <mout_X>
 Lock monitoring output port X.
 .TP
-\fB\-\-mo\-unlock\fR <mout_X>
+\fB\-\-mon\-unlock\fR <mout_X>
 Unlock monitoring output port X. If the port is locked by somebody
 else the port would be forcefully unlocked.
 .SH SERIAL PORTS CONFIGURATION
 .PP
 .TP
-\fB\-\-se\-name\fR <ser_X> <name>
+\fB\-\-ser\-name\fR <ser_X> <name>
 Set serial port X name.
 .TP
-\fB\-\-se\-connect\fR <ser_X> <ser_Y>
-Connect serial port X to serial port Y. This option have two aliases \fB\-\-se\-input\fR
-and \fB\-\-se\-route\fR.
+\fB\-\-ser\-connect\fR <ser_X> <ser_Y>
+Connect serial port X to serial port Y. This option have two aliases \fB\-\-ser\-input\fR
+and \fB\-\-ser\-route\fR.
 .TP
-\fB\-\-se\-clear\fR <ser_X>
+\fB\-\-ser\-clear\fR <ser_X>
 Disconnect serial port X from the connected serial port.
 .TP
-\fB\-\-se\-lock\fR <ser_X>
+\fB\-\-ser\-lock\fR <ser_X>
 Lock serial port X.
 .TP
-\fB\-\-se\-unlock\fR <ser_X>
+\fB\-\-ser\-unlock\fR <ser_X>
 Unlock serial port X. If the port is locked by somebody else the
 port would be forcefully unlocked.
 .TP
-\fB\-\-se\-dir\fR <ser_X> <in|out|auto>
+\fB\-\-ser\-dir\fR <ser_X> <in|out|auto>
 Set serial port X direction. There are three possible settings for
 each port:
  \fBin\fR   - input/control/Workstation
@@ -236,28 +236,28 @@ To get a quick start here are some example command lines.
 
 .nf
  # Rename video output
-   videohubctrl -h sdi --vo-name 8 "Output 8 - test"
-   videohubctrl -h sdi --vo-name "Output 8 - test" "Output 8"
+   videohubctrl -h sdi --out-name 8 "Output 8 - test"
+   videohubctrl -h sdi --out-name "Output 8 - test" "Output 8"
 
  # Rename video input
-   videohubctrl -h sdi --vi-name 4 "Windows 4 HD"
-   videohubctrl -h sdi --vi-name "Windows 4 HD" "CPlay4"
+   videohubctrl -h sdi --in-name 4 "Windows 4 HD"
+   videohubctrl -h sdi --in-name "Windows 4 HD" "CPlay4"
 
  # Lock and then unlock output 16 (unlock assumes that the port is
  # named Output 16). The host name is set via env variable.
    export VIDEOHUB_HOST=sdi
-   videohubctrl --vo-lock 16
-   videohubctrl --vo-unlock "Output 16"
+   videohubctrl --out-lock 16
+   videohubctrl --out-unlock "Output 16"
 
  # Set two outputs to receive from the same input using port names
-   videohubctrl -h sdi --vo-input "Output 8" "Windows 4 HD"
-   videohubctrl -h sdi --vo-input "Output 7" "Windows 4 HD"
+   videohubctrl -h sdi --out-input "Output 8" "Windows 4 HD"
+   videohubctrl -h sdi --out-input "Output 7" "Windows 4 HD"
 
  # Set one input to go out two outputs and two monitoring ports
-   videohubctrl -h sdi --vi-output  "Windows 4 HD" "Output 8" \\
-                       --vi-output  "Windows 4 HD" "Output 7" \\
-                       --vi-monitor "Windows 4 HD" "Monitor 1" \\
-                       --vi-monitor "Windows 4 HD" "Monitor 2"
+   videohubctrl -h sdi --in-output  "Windows 4 HD" "Output 8" \\
+                       --in-output  "Windows 4 HD" "Output 7" \\
+                       --in-monitor "Windows 4 HD" "Monitor 1" \\
+                       --in-monitor "Windows 4 HD" "Monitor 2"
 
  # Run several commands at once
  # Rename video input 11 and 12
@@ -265,15 +265,15 @@ To get a quick start here are some example command lines.
  # Set output 5 to receive from input 12
  # Lock output 5
    videohubctrl --host sdi \\
-                --vi-name 11 "Test input" \\
-                --vi-name 12 "Playout input" \\
-                --vo-name 5 "Encoder h264" \\
-                --vo-input 5 12 \\
-                --vo-lock 5
+                --in-name 11 "Test input" \\
+                --in-name 12 "Playout input" \\
+                --out-name 5 "Encoder h264" \\
+                --out-input 5 12 \\
+                --out-lock 5
 
  # This fails. It tries to use name that is not previously configured.
-   videohubctrl -h sdi --vo-name 1 "Test output" \\
-                       --vo-name "Test output" "Other name"
+   videohubctrl -h sdi --out-name 1 "Test output" \\
+                       --out-name "Test output" "Other name"
 
 .fi
 .SH SEE ALSO

videohubctrl.c

@@ -62,27 +62,57 @@ static const struct option long_options[] = {
 	{ "info",				no_argument,       NULL, 'i' },
 	{ "monitor",			no_argument,       NULL, 'm' },
 	{ "backup",				no_argument,       NULL, 'b' },
+
 	{ "list-device",		no_argument,       NULL, 901 },
+	{ "list-inputs",		no_argument,       NULL, 902 },
 	{ "list-vinputs",		no_argument,       NULL, 902 },
+	{ "list-outputs",		no_argument,       NULL, 903 },
 	{ "list-voutputs",		no_argument,       NULL, 903 },
+	{ "list-monitoring",	no_argument,       NULL, 904 },
 	{ "list-moutputs",		no_argument,       NULL, 904 },
 	{ "list-serial",		no_argument,       NULL, 905 },
 	{ "list-proc-units",	no_argument,       NULL, 906 },
 	{ "list-frames",		no_argument,       NULL, 907 },
+
 	{ "set-name",			required_argument, NULL, 950 },
+
+	{ "in-name",			required_argument, NULL, 1001 },
+	{ "in-output",			required_argument, NULL, 1002 },
+	{ "in-monitor",			required_argument, NULL, 1003 },
 	{ "vi-name",			required_argument, NULL, 1001 },
 	{ "vi-output",			required_argument, NULL, 1002 },
 	{ "vi-monitor",			required_argument, NULL, 1003 },
+
+	{ "out-name",			required_argument, NULL, 2001 },
+	{ "out-input",			required_argument, NULL, 2002 },
+	{ "out-route",			required_argument, NULL, 2002 }, // Alias of --vo-input
+	{ "out-lock",			required_argument, NULL, 2003 },
+	{ "out-unlock",			required_argument, NULL, 2004 },
 	{ "vo-name",			required_argument, NULL, 2001 },
 	{ "vo-input",			required_argument, NULL, 2002 },
 	{ "vo-route",			required_argument, NULL, 2002 }, // Alias of --vo-input
 	{ "vo-lock",			required_argument, NULL, 2003 },
 	{ "vo-unlock",			required_argument, NULL, 2004 },
+
+	{ "mon-name",			required_argument, NULL, 3001 },
+	{ "mon-input",			required_argument, NULL, 3002 },
+	{ "mon-route",			required_argument, NULL, 3002 }, // Alias of --mo-input
+	{ "mon-lock",			required_argument, NULL, 3003 },
+	{ "mon-unlock",			required_argument, NULL, 3004 },
 	{ "mo-name",			required_argument, NULL, 3001 },
 	{ "mo-input",			required_argument, NULL, 3002 },
 	{ "mo-route",			required_argument, NULL, 3002 }, // Alias of --mo-input
 	{ "mo-lock",			required_argument, NULL, 3003 },
 	{ "mo-unlock",			required_argument, NULL, 3004 },
+
+	{ "ser-name",			required_argument, NULL, 4001 },
+	{ "ser-input",			required_argument, NULL, 4002 },
+	{ "ser-connect",		required_argument, NULL, 4002 }, // Alias of --se-input
+	{ "ser-route",			required_argument, NULL, 4002 }, // Alias of --se-input
+	{ "ser-lock",			required_argument, NULL, 4003 },
+	{ "ser-unlock",			required_argument, NULL, 4004 },
+	{ "ser-dir",			required_argument, NULL, 4005 },
+	{ "ser-clear",			required_argument, NULL, 4006 },
 	{ "se-name",			required_argument, NULL, 4001 },
 	{ "se-input",			required_argument, NULL, 4002 },
 	{ "se-connect",			required_argument, NULL, 4002 }, // Alias of --se-input
@@ -91,12 +121,14 @@ static const struct option long_options[] = {
 	{ "se-unlock",			required_argument, NULL, 4004 },
 	{ "se-dir",				required_argument, NULL, 4005 },
 	{ "se-clear",			required_argument, NULL, 4006 },
+
 	{ "pu-input",			required_argument, NULL, 5001 },
 	{ "pu-connect",			required_argument, NULL, 5001 }, // Alias of --pu-input
 	{ "pu-route",			required_argument, NULL, 5001 }, // Alias of --pu-input
 	{ "pu-lock",			required_argument, NULL, 5002 },
 	{ "pu-unlock",			required_argument, NULL, 5003 },
 	{ "pu-clear",			required_argument, NULL, 5004 },
+
 	{ "fr-name",			required_argument, NULL, 6001 },
 	{ "fr-output",			required_argument, NULL, 6002 },
 	{ "fr-connect",			required_argument, NULL, 6002 }, // Alias of --fr-output
@@ -126,53 +158,53 @@ static void show_help(struct videohub_data *data) {
 	printf("                            . the device to the current configuration.\n");
 	printf("\n");
 	printf(" --list-device              | Display device info.\n");
-	printf(" --list-vinputs             | List device video inputs.\n");
-	printf(" --list-voutputs            | List device video outputs.\n");
-	printf(" --list-moutputs            | List device monitoring outputs.\n");
+	printf(" --list-inputs              | List device input ports.\n");
+	printf(" --list-outputs             | List device output ports.\n");
+	printf(" --list-monitor             | List device monitoring outputs.\n");
 	printf(" --list-serial              | List device serial ports.\n");
 	printf(" --list-proc-units          | List device processing units.\n");
 	printf(" --list-frames              | List device frame buffers.\n");
 	printf("\n");
 	printf(" --set-name <name>          | Set the device \"friendly name\".\n");
 	printf("\n");
-	printf("Video inputs configuration:\n");
-	printf(" --vi-name <in_X> <name>    | Set video input port X name.\n");
-	printf(" --vi-output <in_X> <out_Y> | Route video input X to output Y.\n");
-	printf(" --vi-monitor <in_X> <mout_Y> | Route video input X to mon port Y.\n");
+	printf("Inputs configuration:\n");
+	printf(" --in-name <in_X> <name>       | Set input port X name.\n");
+	printf(" --in-output <in_X> <out_Y>    | Route input X to output Y.\n");
+	printf(" --in-monitor <in_X> <mout_Y>  | Route input X to monitor port Y.\n");
 	printf("\n");
-	printf("Video outputs configuration:\n");
-	printf(" --vo-name <out_X> <name>   | Set video output port X name.\n");
-	printf(" --vo-input <out_X> <in_Y>  | Connect video output X to input Y.\n");
-	printf(" --vo-lock <out_X>          | Lock output port X.\n");
-	printf(" --vo-unlock <out_X>        | Unlock output port X.\n");
+	printf("Outputs configuration:\n");
+	printf(" --out-name <out_X> <name>     | Set output port X name.\n");
+	printf(" --out-input <out_X> <in_Y>    | Connect output X to input Y.\n");
+	printf(" --out-lock <out_X>            | Lock output port X.\n");
+	printf(" --out-unlock <out_X>          | Unlock output port X.\n");
 	printf("\n");
 	printf("Monitoring outputs configuration:\n");
-	printf(" --mo-name <mout_X> <name>  | Set monitoring port X name.\n");
-	printf(" --mo-input <mout_X> <in_Y> | Connect monitoring X to input Y.\n");
-	printf(" --mo-lock <mout_X>         | Lock monitoring port X.\n");
-	printf(" --mo-unlock <mout_X>       | Unlock monitoring port X.\n");
+	printf(" --mon-name <mout_X> <name>    | Set monitoring port X name.\n");
+	printf(" --mon-input <mout_X> <in_Y>   | Connect monitoring X to input Y.\n");
+	printf(" --mon-lock <mout_X>           | Lock monitoring port X.\n");
+	printf(" --mon-unlock <mout_X>         | Unlock monitoring port X.\n");
 	printf("\n");
 	printf("Serial ports configuration:\n");
-	printf(" --se-name <ser_X> <name>   | Set serial port X name.\n");
-	printf(" --se-connect <ser_X> <ser_Y> | Connect serial X to serial Y.\n");
-	printf(" --se-clear <ser_X>         | Disconnect serial port X from serial Y.\n");
-	printf(" --se-lock <ser_X>          | Lock serial port X.\n");
-	printf(" --se-unlock <ser_X>        | Unlock serial port X.\n");
-	printf(" --se-dir <ser_X> <dir>     | Set serial port X direction.\n");
-	printf("                            . <dir> can be 'auto', 'in' or 'out'.\n");
+	printf(" --ser-name <ser_X> <name>     | Set serial port X name.\n");
+	printf(" --ser-connect <ser_X> <ser_Y> | Connect serial X to serial Y.\n");
+	printf(" --ser-clear <ser_X>           | Disconnect serial port X from serial Y.\n");
+	printf(" --ser-lock <ser_X>            | Lock serial port X.\n");
+	printf(" --ser-unlock <ser_X>          | Unlock serial port X.\n");
+	printf(" --ser-dir <ser_X> <dir>       | Set serial port X direction.\n");
+	printf("                               . <dir> can be 'auto', 'in' or 'out'.\n");
 	printf("\n");
 	printf("Processing units configuration:\n");
-	printf(" --pu-input <pu_X> <in_Y>   | Connect processing unit X to input Y.\n");
-	printf(" --pu-clear <pu_X>          | Disconnect unit X from input Y.\n");
-	printf(" --pu-lock <pu_X>           | Lock processing unit X.\n");
-	printf(" --pu-unlock <pu_X>         | Unlock processing unit X.\n");
+	printf(" --pu-input <pu_X> <in_Y>      | Connect processing unit X to input Y.\n");
+	printf(" --pu-clear <pu_X>             | Disconnect unit X from input Y.\n");
+	printf(" --pu-lock <pu_X>              | Lock processing unit X.\n");
+	printf(" --pu-unlock <pu_X>            | Unlock processing unit X.\n");
 	printf("\n");
 	printf("Frames configuration:\n");
-	printf(" --fr-name <fr_X> <name>    | Set frame X name.\n");
-	printf(" --fr-output <fr_X> <out_Y> | Output frame X to output Y.\n");
-	printf(" --fr-clear <fr_X>          | Stop outputing frame X to the output.\n");
-	printf(" --fr-lock <fr_X>           | Lock frame X.\n");
-	printf(" --fr-unlock <rf_X>         | Unlock frame X.\n");
+	printf(" --fr-name <fr_X> <name>       | Set frame X name.\n");
+	printf(" --fr-output <fr_X> <out_Y>    | Output frame X to output Y.\n");
+	printf(" --fr-clear <fr_X>             | Stop outputing frame X to the output.\n");
+	printf(" --fr-lock <fr_X>              | Lock frame X.\n");
+	printf(" --fr-unlock <rf_X>            | Unlock frame X.\n");
 	printf("\n");
 	printf("Misc options:\n");
 	printf(" -T --test-input <file>     | Read commands from <file>.\n");