Increase white space in tables so they look ok with ports number > 99.

README

@@ -158,87 +158,87 @@ in tests/input-00.txt file.
 |----------------------------------------------------------------------|
 $ videohubctrl --test tests/input-00.txt
 Device info
-  -----------------------------------------------------------
-  | Device address             | sdi-matrix                 |
-  | Device port                | 9990                       |
-  | Model name                 | Blackmagic Micro Videohub  |
-  | Unique ID                  | 7c2e0d021714               |
-  | Protocol                   | 2.4                        |
-  | Video inputs               | 16                         |
-  | Video outputs              | 16                         |
-  | Serial ports               | 8                          |
-  | Video monitoring outputs   | 4                          |
-  -----------------------------------------------------------
+  -------------------------------------------------------------------
+  | Device address             | sdi-matrix                         |
+  | Device port                | 9990                               |
+  | Model name                 | Blackmagic Micro Videohub          |
+  | Unique ID                  | 7c2e0d021714                       |
+  | Protocol                   | 2.4                                |
+  | Video inputs               | 16                                 |
+  | Video outputs              | 16                                 |
+  | Serial ports               | 8                                  |
+  | Video monitoring outputs   | 4                                  |
+  -------------------------------------------------------------------
 
 Video inputs
-  --------------------------------------------------------------------
-  | ## | Video input name         | n | Routed to output         | s |
-  --------------------------------------------------------------------
-  |  1 | Windows 1                | 2 | Enc1 3                   | B |
-  |    |                          |   | Enc1 4                   |   |
-  |  2 | Windows 2                | 1 | Enc1 2                   | B |
-  |  3 | Windows 3                | 1 | Enc1 1                   | B |
-  |  4 | Windows 4 HD             | 2 | Output 8                 | B |
-  |    |                          |   | Enc2 1                   |   |
-  |  5 | Input 5                  | 1 | Output 5                 | o |
-  |  6 | Input 6                  | 1 | Output 6                 | o |
-  |  7 | Input 7                  | 1 | Output 7                 | o |
-  |  8 | Input 8                  | 0 | -                        | o |
-  |  9 | Input 9                  | 0 | -                        |   |
-  | 10 | Input 10                 | 1 | Output 10                |   |
-  | 11 | Input 11                 | 1 | Output 11                |   |
-  | 12 | DPlay1                   | 1 | Output 13                |   |
-  | 13 | DPlay2                   | 1 | Denc                     |   |
-  | 14 | Input 14                 | 1 | Output 14                | x |
-  | 15 | Input 15                 | 1 | Output 15                | x |
-  | 16 | Loopback                 | 1 | Loopback                 |   |
-  --------------------------------------------------------------------
+  ----------------------------------------------------------------------
+  | ### | Video input name         | nn | Routed to output         | s |
+  ----------------------------------------------------------------------
+  |   1 | Windows 1                |  2 | Enc1 3                   | B |
+  |     |                          |    | Enc1 4                   |   |
+  |   2 | Windows 2                |  1 | Enc1 2                   | B |
+  |   3 | Windows 3                |  1 | Enc1 1                   | B |
+  |   4 | Windows 4 HD             |  2 | Output 8                 | B |
+  |     |                          |    | Enc2 1                   |   |
+  |   5 | Input 5                  |  1 | Output 5                 | o |
+  |   6 | Input 6                  |  1 | Output 6                 | o |
+  |   7 | Input 7                  |  1 | Output 7                 | o |
+  |   8 | Input 8                  |  0 | -                        | o |
+  |   9 | Input 9                  |  0 | -                        |   |
+  |  10 | Input 10                 |  1 | Output 10                |   |
+  |  11 | Input 11                 |  1 | Output 11                |   |
+  |  12 | DPlay1                   |  1 | Output 13                |   |
+  |  13 | DPlay2                   |  1 | Denc                     |   |
+  |  14 | Input 14                 |  1 | Output 14                | x |
+  |  15 | Input 15                 |  1 | Output 15                | x |
+  |  16 | Loopback                 |  1 | Loopback                 |   |
+  ----------------------------------------------------------------------
 
 Video outputs
-  --------------------------------------------------------------------
-  | ## | x | Video output name        | Connected video input    | s |
-  --------------------------------------------------------------------
-  |  1 | L | Enc1 1                   | Windows 3                |   |
-  |  2 | L | Enc1 2                   | Windows 2                |   |
-  |  3 | L | Enc1 3                   | Windows 1                |   |
-  |  4 | L | Enc1 4                   | Windows 1                |   |
-  |  5 |   | Output 5                 | Input 5                  | x |
-  |  6 |   | Output 6                 | Input 6                  | x |
-  |  7 |   | Output 7                 | Input 7                  | x |
-  |  8 |   | Output 8                 | Windows 4 HD             |   |
-  |  9 | L | Enc2 1                   | Windows 4 HD             | B |
-  | 10 |   | Output 10                | Input 10                 | B |
-  | 11 |   | Output 11                | Input 11                 | B |
-  | 12 | L | Denc                     | DPlay2                   | B |
-  | 13 | O | Output 13                | DPlay1                   | o |
-  | 14 |   | Output 14                | Input 14                 | o |
-  | 15 |   | Output 15                | Input 15                 | o |
-  | 16 | O | Loopback                 | Loopback                 | o |
-  --------------------------------------------------------------------
+  ---------------------------------------------------------------------
+  | ### | x | Video output name        | Connected video input    | s |
+  ---------------------------------------------------------------------
+  |   1 | L | Enc1 1                   | Windows 3                |   |
+  |   2 | L | Enc1 2                   | Windows 2                |   |
+  |   3 | L | Enc1 3                   | Windows 1                |   |
+  |   4 | L | Enc1 4                   | Windows 1                |   |
+  |   5 |   | Output 5                 | Input 5                  | x |
+  |   6 |   | Output 6                 | Input 6                  | x |
+  |   7 |   | Output 7                 | Input 7                  | x |
+  |   8 |   | Output 8                 | Windows 4 HD             |   |
+  |   9 | L | Enc2 1                   | Windows 4 HD             | B |
+  |  10 |   | Output 10                | Input 10                 | B |
+  |  11 |   | Output 11                | Input 11                 | B |
+  |  12 | L | Denc                     | DPlay2                   | B |
+  |  13 | O | Output 13                | DPlay1                   | o |
+  |  14 |   | Output 14                | Input 14                 | o |
+  |  15 |   | Output 15                | Input 15                 | o |
+  |  16 | O | Loopback                 | Loopback                 | o |
+  ---------------------------------------------------------------------
 
 Monitoring outputs
-  ----------------------------------------------------------------
-  | ## | x | Monitoring output name   | Connected video input    |
-  ----------------------------------------------------------------
-  |  1 |   | Monitor 1                | Windows 1                |
-  |  2 | O | Monitor 2                | Windows 2                |
-  |  3 | L | Monitor 3                | Windows 3                |
-  |  4 |   | Monitor 4                | Windows 4 HD             |
-  ----------------------------------------------------------------
+  -----------------------------------------------------------------
+  | ### | x | Monitoring output name   | Connected video input    |
+  -----------------------------------------------------------------
+  |   1 |   | Monitor 1                | Windows 1                |
+  |   2 | O | Monitor 2                | Windows 2                |
+  |   3 | L | Monitor 3                | Windows 3                |
+  |   4 |   | Monitor 4                | Windows 4 HD             |
+  -----------------------------------------------------------------
 
 Serial ports
-  ---------------------------------------------------------------
-  | ## | x | Dir  | Serial port        | Connected serial   | s |
-  ---------------------------------------------------------------
-  |  1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
-  |  2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
-  |  3 | L |  out | Deck 3             |                    | 4 |
-  |  4 |   | auto | Deck 4             |                    | 4 |
-  |  5 |   | auto | Serial 5           |                    |   |
-  |  6 |   | auto | Serial 6           |                    |   |
-  |  7 |   |   in | Serial 7           |                    | x |
-  |  8 |   |  out | Serial 8           |                    | x |
-  ---------------------------------------------------------------
+  ----------------------------------------------------------------
+  | ### | x | Dir  | Serial port        | Connected serial   | s |
+  ----------------------------------------------------------------
+  |   1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
+  |   2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
+  |   3 | L |  out | Deck 3             |                    | 4 |
+  |   4 |   | auto | Deck 4             |                    | 4 |
+  |   5 |   | auto | Serial 5           |                    |   |
+  |   6 |   | auto | Serial 6           |                    |   |
+  |   7 |   |   in | Serial 7           |                    | x |
+  |   8 |   |  out | Serial 8           |                    | x |
+  ----------------------------------------------------------------
 
 |----------------------------------------------------------------------|
 
@@ -246,37 +246,37 @@ Serial ports
 Video inputs Legend
 ===================
 
- Column 1 (##) - Input port number
- Column 2      - Input port names
- Column 3 (n)  - To how much outputs this input is routed.
- Column 4      - List of output ports which are connected to this input.
- Column 5 (s)  - Port status /type/. Universal Videohub's support
-                 BNC/Optical ports and this column shows the port type.
-                     - Empty means that the device do not support port
-                       status.
-                  x  - The port type is "None". This means that the
-                       port is not installed.
-                  B  - The port type is "BNC".
-                  o  - The port type is "Optical".
-                  T  - The port type is "Thunderbolt".
+ Column 1 (###) - Input port number
+ Column 2       - Input port names
+ Column 3 (nn)  - To how much outputs this input is routed.
+ Column 4       - List of output ports which are connected to this input.
+ Column 5 (s)   - Port status /type/. Universal Videohub's support
+                  BNC/Optical ports and this column shows the port type.
+                      - Empty means that the device do not support port
+                        status.
+                   x  - The port type is "None". This means that the
+                        port is not installed.
+                   B  - The port type is "BNC".
+                   o  - The port type is "Optical".
+                   T  - The port type is "Thunderbolt".
 
 
 Video outputs Legend
 ====================
 
- Column 1 (##) - Output port number
- Column 2 (x)  - Output port lock status
-                  L - The port is locked by another IP address (user)
-                  O - The port is locked by me (from my IP address)
- Column 3      - Output port names
- Column 4      - Which input port is routed to this output
- Column 5 (s)  - Port status /type/. Same format as in input ports.
+ Column 1 (###) - Output port number
+ Column 2 (x)   - Output port lock status
+                   L - The port is locked by another IP address (user)
+                   O - The port is locked by me (from my IP address)
+ Column 3       - Output port names
+ Column 4       - Which input port is routed to this output
+ Column 5 (s)   - Port status /type/. Same format as in input ports.
 
 
 Serial ports Legend
 ===================
 
- Column 1 (##)  - Serial port number
+ Column 1 (###) - Serial port number
  Column 2 (x)   - Serial port lock status
  Column 3 (Dir) - Serial port direction.
                    in   - Input/Control (Workstation) port

display.c

@@ -39,33 +39,33 @@ static char format_status(enum port_status status) {
 }
 
 void print_device_info(struct videohub_data *d) {
-	int len = 59;
+	int len = 67;
 	printf("Device info\n");
 	printf_line(len);
-	printf("  | %-26s | %-26s |\n", "Device address", d->dev_host);
-	printf("  | %-26s | %-26s |\n", "Device port", d->dev_port);
-	printf("  | %-26s | %-26s |\n", "Model name", d->device.model_name);
-	printf("  | %-26s | %-26s |\n", "Unique ID", d->device.unique_id);
-	printf("  | %-26s | %-26s |\n", "Protocol", d->device.protocol_ver);
-	printf("  | %-26s | %-26u |\n", "Video inputs", d->inputs.num);
-	printf("  | %-26s | %-26u |\n", "Video outputs", d->outputs.num);
+	printf("  | %-26s | %-34s |\n", "Device address", d->dev_host);
+	printf("  | %-26s | %-34s |\n", "Device port", d->dev_port);
+	printf("  | %-26s | %-34s |\n", "Model name", d->device.model_name);
+	printf("  | %-26s | %-34s |\n", "Unique ID", d->device.unique_id);
+	printf("  | %-26s | %-34s |\n", "Protocol", d->device.protocol_ver);
+	printf("  | %-26s | %-34u |\n", "Video inputs", d->inputs.num);
+	printf("  | %-26s | %-34u |\n", "Video outputs", d->outputs.num);
 	if (d->serial.num)
-		printf("  | %-26s | %-26u |\n", "Serial ports", d->serial.num);
+		printf("  | %-26s | %-34u |\n", "Serial ports", d->serial.num);
 	if (d->device.num_video_processing_units)
-		printf("  | %-26s | %-26u |\n", "Video processing units", d->device.num_video_processing_units);
+		printf("  | %-26s | %-34u |\n", "Video processing units", d->device.num_video_processing_units);
 	if (d->mon_outputs.num)
-		printf("  | %-26s | %-26u |\n", "Video monitoring outputs", d->mon_outputs.num);
+		printf("  | %-26s | %-34u |\n", "Video monitoring outputs", d->mon_outputs.num);
 	printf_line(len);
 	printf("\n");
 }
 
 void print_device_video_inputs(struct videohub_data *d) {
-	unsigned int i, r, len = 68;
+	unsigned int i, r, len = 70;
 	if (!d->inputs.num)
 		return;
 	printf("Video inputs\n");
 	printf_line(len);
-	printf("  | ## | %-24s | n | %-24s | s |\n", "Video input name", "Routed to output");
+	printf("  | ### | %-24s | nn | %-24s | s |\n", "Video input name", "Routed to output");
 	printf_line(len);
 	for(i = 0; i < d->inputs.num; i++) {
 		unsigned int num_outputs = 0, routed_to = 0;
@@ -76,7 +76,7 @@ void print_device_video_inputs(struct videohub_data *d) {
 					routed_to = r; // The first output
 			}
 		}
-		printf("  | %2d | %-24s | %d | ", i + 1, d->inputs.port[i].name,
+		printf("  | %3d | %-24s | %2d | ", i + 1, d->inputs.port[i].name,
 			 num_outputs);
 		if (num_outputs == 0) {
 			printf("%-24s | %c |\n", "-", format_status(d->inputs.port[i].status));
@@ -92,7 +92,7 @@ void print_device_video_inputs(struct videohub_data *d) {
 						first_skipped = true;
 						continue;
 					}
-					printf("  | %2s | %-24s | %s | %-24s | %c |\n",
+					printf("  | %3s | %-24s | %2s | %-24s | %c |\n",
 						" ", " ", " ", d->outputs.port[r].name, ' ');
 				}
 			}
@@ -112,15 +112,15 @@ static char port_lock_symbol(enum port_lock p) {
 }
 
 void print_device_video_outputs(struct videohub_data *d) {
-	unsigned int i, len = 68;
+	unsigned int i, len = 69;
 	if (!d->outputs.num)
 		return;
 	printf("Video outputs\n");
 	printf_line(len);
-	printf("  | ## | x | %-24s | %-24s | s |\n", "Video output name", "Connected video input");
+	printf("  | ### | x | %-24s | %-24s | s |\n", "Video output name", "Connected video input");
 	printf_line(len);
 	for(i = 0; i < d->outputs.num; i++) {
-		printf("  | %2d | %c | %-24s | %-24s | %c |\n",
+		printf("  | %3d | %c | %-24s | %-24s | %c |\n",
 			i + 1,
 			port_lock_symbol(d->outputs.port[i].lock),
 			d->outputs.port[i].name,
@@ -133,15 +133,15 @@ void print_device_video_outputs(struct videohub_data *d) {
 }
 
 void print_device_monitoring_outputs(struct videohub_data *d) {
-	unsigned int i, len = 64;
+	unsigned int i, len = 65;
 	if (!d->mon_outputs.num)
 		return;
 	printf("Monitoring outputs\n");
 	printf_line(len);
-	printf("  | ## | x | %-24s | %-24s |\n", "Monitoring output name", "Connected video input");
+	printf("  | ### | x | %-24s | %-24s |\n", "Monitoring output name", "Connected video input");
 	printf_line(len);
 	for(i = 0; i < d->mon_outputs.num; i++) {
-		printf("  | %2d | %c | %-24s | %-24s |\n",
+		printf("  | %3d | %c | %-24s | %-24s |\n",
 			i + 1,
 			port_lock_symbol(d->mon_outputs.port[i].lock),
 			d->mon_outputs.port[i].name,
@@ -162,15 +162,15 @@ static char *dir2opt(enum serial_dir dir) {
 }
 
 void print_device_serial_ports(struct videohub_data *d) {
-	unsigned int i, len = 63;
+	unsigned int i, len = 64;
 	if (!d->serial.num)
 		return;
 	printf("Serial ports\n");
 	printf_line(len);
-	printf("  | ## | x | Dir  | %-18s | %-18s | s |\n", "Serial port", "Connected serial");
+	printf("  | ### | x | Dir  | %-18s | %-18s | s |\n", "Serial port", "Connected serial");
 	printf_line(len);
 	for(i = 0; i < d->serial.num; i++) {
-		printf("  | %2d | %c | %4s | %-18s | %-18s | %c |\n",
+		printf("  | %3d | %c | %4s | %-18s | %-18s | %c |\n",
 			i + 1,
 			port_lock_symbol(d->serial.port[i].lock),
 			dir2opt(d->serial.port[i].direction),
@@ -191,24 +191,24 @@ static void __print_opt(struct videohub_data *d, enum vcmd vcmd) {
 	for(i = 0; i < s_port->num; i++) {
 		switch (v->type) {
 		case PARSE_LABEL:
-			printf("  --%s-name %2d \"%s\" \\\n", p, i + 1, s_port->port[i].name);
+			printf("  --%s-name %3d \"%s\" \\\n", p, i + 1, s_port->port[i].name);
 			break;
 		case PARSE_ROUTE:
 			if (s_port->port[i].routed_to == NO_PORT)
 				continue;
-			printf("  --%s-input %2d %2d \\\n", p, i + 1, s_port->port[i].routed_to + 1);
+			printf("  --%s-input %3d %3d \\\n", p, i + 1, s_port->port[i].routed_to + 1);
 			break;
 		case PARSE_LOCK:
 			last = i + 1 < s_port->num;
 			if (s_port->port[i].lock != PORT_UNLOCKED) {
-				printf("  --%s-unlock %2d --%s-lock %2d%s\n",
+				printf("  --%s-unlock %3d --%s-lock %3d%s\n",
 					p, i + 1, p, i + 1, last ? " \\" : "");
 			} else {
-				printf("  --%s-unlock %2d%s\n", p, i + 1, last ? " \\" : "");
+				printf("  --%s-unlock %3d%s\n", p, i + 1, last ? " \\" : "");
 			}
 			break;
 		case PARSE_DIR:
-			printf("  --%s-dir %2d %s \\\n", p, i + 1, dir2opt(s_port->port[i].direction));
+			printf("  --%s-dir %3d %s \\\n", p, i + 1, dir2opt(s_port->port[i].direction));
 			break;
 		default: break;
 		}

test/input-17.txt

@@ -0,0 +1,211 @@
+PROTOCOL PREAMBLE:
+Version: 2.4
+
+VIDEOHUB DEVICE:
+Device present: true
+Model name: Blackmagic Workgroup Videohub
+Friendly name: SDI router on the 5th floor
+Unique ID: 465647757584
+Video inputs: 16
+Video processing units: 16
+Video outputs: 32
+Video monitoring outputs: 8
+Serial ports: 8
+Debug mode: true
+Debug mode: yes
+Power: both
+
+INPUT LABELS:
+0 Windows 1
+1 Windows 2
+2 Windows 3
+3 Windows 4 HD
+4 Input 5
+5 Input 6
+6 Input 7
+7 Input 8
+8 Input 9
+9 Input 10
+10 Input 11
+11 DPlay1
+12 DPlay2
+13 Input 14
+14 Input 15
+15 Loopback
+
+ALARM STATUS:
+0 Error
+
+END PRELUDE:
+
+ENGINEERING:
+0 Hack
+1 Hack
+
+OUTPUT LABELS:
+0 Enc1 1
+1 Enc1 2
+2 Enc1 3
+3 Enc1 4
+4 Output 5
+5 Output 6
+6 Output 7
+7 Output 8
+8 Enc2 1
+9 Output 10
+10 Output 11
+11 Denc
+12 Output 13
+13 Output 14
+14 Output 15
+15 Loopback
+
+VIDEO OUTPUT LOCKS:
+0 L
+1 L
+2 L
+3 L
+4 U
+5 U
+6 U
+7 U
+8 L
+9 U
+10 U
+11 L
+12 O
+13 U
+14 U
+15 O
+
+VIDEO OUTPUT ROUTING:
+0 2
+1 1
+2 0
+3 0
+4 4
+5 5
+6 6
+7 3
+8 3
+9 9
+10 10
+11 12
+12 11
+13 13
+14 14
+15 15
+
+VIDEO INPUT STATUS:
+0 BNC
+1 BNC
+2 BNC
+3 BNC
+4 Optical
+5 Optical
+6 Optical
+7 Optical
+13 None
+14 None
+
+VIDEO OUTPUT STATUS:
+4 None
+5 None
+6 None
+8 BNC
+9 BNC
+10 BNC
+11 BNC
+12 Optical
+13 Optical
+14 Optical
+15 Optical
+
+MONITORING OUTPUT LABELS:
+0 Monitor 1
+1 Monitor 2
+2 Monitor 3
+3 Monitor 4
+
+VIDEO MONITORING OUTPUT ROUTING:
+0 0
+1 1
+2 2
+3 3
+
+MONITORING OUTPUT LOCKS:
+0 U
+1 O
+2 L
+3 U
+
+SERIAL PORT LABELS:
+0 Serial Ctrl 1
+1 Serial Ctrl 2
+2 Deck 3
+3 Deck 4
+4 Serial 5
+5 Serial 6
+6 Serial 7
+7 Serial 8
+
+SERIAL PORT ROUTING:
+0 2
+1 3
+
+SERIAL PORT LOCKS:
+0 O
+1 U
+2 L
+3 U
+
+SERIAL PORT STATUS:
+0 RS422
+1 RS422
+2 RS422
+3 RS422
+6 None
+7 None
+
+SERIAL PORT DIRECTIONS:
+0 control
+1 auto
+2 slave
+3 auto
+4 auto
+5 auto
+6 control
+7 slave
+
+FRAME LABELS:
+0 gf-Frame 1
+1 Frame 2
+2 gf-Frame 3
+3 Frame 4
+4 gf-Frame 5
+5 Frame 6
+6 gf-Frame 7
+7 Frame 8
+
+FRAME BUFFER ROUTING:
+0 Frame 4
+1 gf-Frame 3
+2 Frame 6
+
+FRAME BUFFER LOCKS:
+0 U
+
+PROCESSING UNIT ROUTING:
+0 Output 15
+
+PROCESSING UNIT LOCKS:
+0 U
+
+ALARM STATUS:
+0 Error
+
+END PRELUDE:
+
+ENGINEERING:
+0 Debug
+

test/run

@@ -129,3 +129,6 @@ check test/test-15 "Test --list-moutputs option output"
 
 videohubctrl --test-input test/input-00.txt --list-serial $@ &> test/test-16.out
 check test/test-16 "Test --list-serial option output"
+
+videohubctrl --test-input test/input-17.txt --info $@ &> test/test-17.out
+check test/test-17 "Test wider range of input commands"

test/test-01.ok

@@ -1,83 +1,83 @@
 Device info
-  -----------------------------------------------------------
-  | Device address             | sdi-matrix                 |
-  | Device port                | 9990                       |
-  | Model name                 | Blackmagic Micro Videohub  |
-  | Unique ID                  | 7c2e0d021714               |
-  | Protocol                   | 2.4                        |
-  | Video inputs               | 16                         |
-  | Video outputs              | 16                         |
-  | Serial ports               | 8                          |
-  | Video monitoring outputs   | 4                          |
-  -----------------------------------------------------------
+  -------------------------------------------------------------------
+  | Device address             | sdi-matrix                         |
+  | Device port                | 9990                               |
+  | Model name                 | Blackmagic Micro Videohub          |
+  | Unique ID                  | 7c2e0d021714                       |
+  | Protocol                   | 2.4                                |
+  | Video inputs               | 16                                 |
+  | Video outputs              | 16                                 |
+  | Serial ports               | 8                                  |
+  | Video monitoring outputs   | 4                                  |
+  -------------------------------------------------------------------
 
 Video inputs
-  --------------------------------------------------------------------
-  | ## | Video input name         | n | Routed to output         | s |
-  --------------------------------------------------------------------
-  |  1 | Windows 1                | 2 | Enc1 3                   | B |
-  |    |                          |   | Enc1 4                   |   |
-  |  2 | Windows 2                | 1 | Enc1 2                   | B |
-  |  3 | Windows 3                | 1 | Enc1 1                   | B |
-  |  4 | Windows 4 HD             | 2 | Output 8                 | B |
-  |    |                          |   | Enc2 1                   |   |
-  |  5 | Input 5                  | 1 | Output 5                 | o |
-  |  6 | Input 6                  | 1 | Output 6                 | o |
-  |  7 | Input 7                  | 1 | Output 7                 | o |
-  |  8 | Input 8                  | 0 | -                        | o |
-  |  9 | Input 9                  | 0 | -                        |   |
-  | 10 | Input 10                 | 1 | Output 10                |   |
-  | 11 | Input 11                 | 1 | Output 11                |   |
-  | 12 | DPlay1                   | 1 | Output 13                |   |
-  | 13 | DPlay2                   | 1 | Denc                     |   |
-  | 14 | Input 14                 | 1 | Output 14                | x |
-  | 15 | Input 15                 | 1 | Output 15                | x |
-  | 16 | Loopback                 | 1 | Loopback                 |   |
-  --------------------------------------------------------------------
+  ----------------------------------------------------------------------
+  | ### | Video input name         | nn | Routed to output         | s |
+  ----------------------------------------------------------------------
+  |   1 | Windows 1                |  2 | Enc1 3                   | B |
+  |     |                          |    | Enc1 4                   |   |
+  |   2 | Windows 2                |  1 | Enc1 2                   | B |
+  |   3 | Windows 3                |  1 | Enc1 1                   | B |
+  |   4 | Windows 4 HD             |  2 | Output 8                 | B |
+  |     |                          |    | Enc2 1                   |   |
+  |   5 | Input 5                  |  1 | Output 5                 | o |
+  |   6 | Input 6                  |  1 | Output 6                 | o |
+  |   7 | Input 7                  |  1 | Output 7                 | o |
+  |   8 | Input 8                  |  0 | -                        | o |
+  |   9 | Input 9                  |  0 | -                        |   |
+  |  10 | Input 10                 |  1 | Output 10                |   |
+  |  11 | Input 11                 |  1 | Output 11                |   |
+  |  12 | DPlay1                   |  1 | Output 13                |   |
+  |  13 | DPlay2                   |  1 | Denc                     |   |
+  |  14 | Input 14                 |  1 | Output 14                | x |
+  |  15 | Input 15                 |  1 | Output 15                | x |
+  |  16 | Loopback                 |  1 | Loopback                 |   |
+  ----------------------------------------------------------------------
 
 Video outputs
-  --------------------------------------------------------------------
-  | ## | x | Video output name        | Connected video input    | s |
-  --------------------------------------------------------------------
-  |  1 | L | Enc1 1                   | Windows 3                |   |
-  |  2 | L | Enc1 2                   | Windows 2                |   |
-  |  3 | L | Enc1 3                   | Windows 1                |   |
-  |  4 | L | Enc1 4                   | Windows 1                |   |
-  |  5 |   | Output 5                 | Input 5                  | x |
-  |  6 |   | Output 6                 | Input 6                  | x |
-  |  7 |   | Output 7                 | Input 7                  | x |
-  |  8 |   | Output 8                 | Windows 4 HD             |   |
-  |  9 | L | Enc2 1                   | Windows 4 HD             | B |
-  | 10 |   | Output 10                | Input 10                 | B |
-  | 11 |   | Output 11                | Input 11                 | B |
-  | 12 | L | Denc                     | DPlay2                   | B |
-  | 13 | O | Output 13                | DPlay1                   | o |
-  | 14 |   | Output 14                | Input 14                 | o |
-  | 15 |   | Output 15                | Input 15                 | o |
-  | 16 | O | Loopback                 | Loopback                 | o |
-  --------------------------------------------------------------------
+  ---------------------------------------------------------------------
+  | ### | x | Video output name        | Connected video input    | s |
+  ---------------------------------------------------------------------
+  |   1 | L | Enc1 1                   | Windows 3                |   |
+  |   2 | L | Enc1 2                   | Windows 2                |   |
+  |   3 | L | Enc1 3                   | Windows 1                |   |
+  |   4 | L | Enc1 4                   | Windows 1                |   |
+  |   5 |   | Output 5                 | Input 5                  | x |
+  |   6 |   | Output 6                 | Input 6                  | x |
+  |   7 |   | Output 7                 | Input 7                  | x |
+  |   8 |   | Output 8                 | Windows 4 HD             |   |
+  |   9 | L | Enc2 1                   | Windows 4 HD             | B |
+  |  10 |   | Output 10                | Input 10                 | B |
+  |  11 |   | Output 11                | Input 11                 | B |
+  |  12 | L | Denc                     | DPlay2                   | B |
+  |  13 | O | Output 13                | DPlay1                   | o |
+  |  14 |   | Output 14                | Input 14                 | o |
+  |  15 |   | Output 15                | Input 15                 | o |
+  |  16 | O | Loopback                 | Loopback                 | o |
+  ---------------------------------------------------------------------
 
 Monitoring outputs
-  ----------------------------------------------------------------
-  | ## | x | Monitoring output name   | Connected video input    |
-  ----------------------------------------------------------------
-  |  1 |   | Monitor 1                | Windows 1                |
-  |  2 | O | Monitor 2                | Windows 2                |
-  |  3 | L | Monitor 3                | Windows 3                |
-  |  4 |   | Monitor 4                | Windows 4 HD             |
-  ----------------------------------------------------------------
+  -----------------------------------------------------------------
+  | ### | x | Monitoring output name   | Connected video input    |
+  -----------------------------------------------------------------
+  |   1 |   | Monitor 1                | Windows 1                |
+  |   2 | O | Monitor 2                | Windows 2                |
+  |   3 | L | Monitor 3                | Windows 3                |
+  |   4 |   | Monitor 4                | Windows 4 HD             |
+  -----------------------------------------------------------------
 
 Serial ports
-  ---------------------------------------------------------------
-  | ## | x | Dir  | Serial port        | Connected serial   | s |
-  ---------------------------------------------------------------
-  |  1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
-  |  2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
-  |  3 | L |  out | Deck 3             |                    | 4 |
-  |  4 |   | auto | Deck 4             |                    | 4 |
-  |  5 |   | auto | Serial 5           |                    |   |
-  |  6 |   | auto | Serial 6           |                    |   |
-  |  7 |   |   in | Serial 7           |                    | x |
-  |  8 |   |  out | Serial 8           |                    | x |
-  ---------------------------------------------------------------
+  ----------------------------------------------------------------
+  | ### | x | Dir  | Serial port        | Connected serial   | s |
+  ----------------------------------------------------------------
+  |   1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
+  |   2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
+  |   3 | L |  out | Deck 3             |                    | 4 |
+  |   4 |   | auto | Deck 4             |                    | 4 |
+  |   5 |   | auto | Serial 5           |                    |   |
+  |   6 |   | auto | Serial 6           |                    |   |
+  |   7 |   |   in | Serial 7           |                    | x |
+  |   8 |   |  out | Serial 8           |                    | x |
+  ----------------------------------------------------------------
 

test/test-02.ok

@@ -1,104 +1,104 @@
 videohubctrl \
-  --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" \
-  --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 \
-  --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
+  --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" \
+  --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 \
+  --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
 

test/test-03.ok

@@ -113,85 +113,85 @@ videohub: unlock serial 6 "Serial 6"
 videohub: unlock serial 7 "Serial 7"
 videohub: unlock serial 8 "Serial 8"
 Device info
-  -----------------------------------------------------------
-  | Device address             | sdi-matrix                 |
-  | Device port                | 9990                       |
-  | Model name                 | Blackmagic Micro Videohub  |
-  | Unique ID                  | 7c2e0d021714               |
-  | Protocol                   | 2.4                        |
-  | Video inputs               | 16                         |
-  | Video outputs              | 16                         |
-  | Serial ports               | 8                          |
-  | Video monitoring outputs   | 4                          |
-  -----------------------------------------------------------
+  -------------------------------------------------------------------
+  | Device address             | sdi-matrix                         |
+  | Device port                | 9990                               |
+  | Model name                 | Blackmagic Micro Videohub          |
+  | Unique ID                  | 7c2e0d021714                       |
+  | Protocol                   | 2.4                                |
+  | Video inputs               | 16                                 |
+  | Video outputs              | 16                                 |
+  | Serial ports               | 8                                  |
+  | Video monitoring outputs   | 4                                  |
+  -------------------------------------------------------------------
 
 Video inputs
-  --------------------------------------------------------------------
-  | ## | Video input name         | n | Routed to output         | s |
-  --------------------------------------------------------------------
-  |  1 | Windows 1                | 2 | Enc1 3                   | B |
-  |    |                          |   | Enc1 4                   |   |
-  |  2 | Windows 2                | 1 | Enc1 2                   | B |
-  |  3 | Windows 3                | 1 | Enc1 1                   | B |
-  |  4 | Windows 4 HD             | 2 | Output 8                 | B |
-  |    |                          |   | Enc2 1                   |   |
-  |  5 | Input 5                  | 1 | Output 5                 | o |
-  |  6 | Input 6                  | 1 | Output 6                 | o |
-  |  7 | Input 7                  | 1 | Output 7                 | o |
-  |  8 | Input 8                  | 0 | -                        | o |
-  |  9 | Input 9                  | 0 | -                        |   |
-  | 10 | Input 10                 | 1 | Output 10                |   |
-  | 11 | Input 11                 | 1 | Output 11                |   |
-  | 12 | DPlay1                   | 1 | Output 13                |   |
-  | 13 | DPlay2                   | 1 | Denc                     |   |
-  | 14 | Input 14                 | 1 | Output 14                | x |
-  | 15 | Input 15                 | 1 | Output 15                | x |
-  | 16 | Loopback                 | 1 | Loopback                 |   |
-  --------------------------------------------------------------------
+  ----------------------------------------------------------------------
+  | ### | Video input name         | nn | Routed to output         | s |
+  ----------------------------------------------------------------------
+  |   1 | Windows 1                |  2 | Enc1 3                   | B |
+  |     |                          |    | Enc1 4                   |   |
+  |   2 | Windows 2                |  1 | Enc1 2                   | B |
+  |   3 | Windows 3                |  1 | Enc1 1                   | B |
+  |   4 | Windows 4 HD             |  2 | Output 8                 | B |
+  |     |                          |    | Enc2 1                   |   |
+  |   5 | Input 5                  |  1 | Output 5                 | o |
+  |   6 | Input 6                  |  1 | Output 6                 | o |
+  |   7 | Input 7                  |  1 | Output 7                 | o |
+  |   8 | Input 8                  |  0 | -                        | o |
+  |   9 | Input 9                  |  0 | -                        |   |
+  |  10 | Input 10                 |  1 | Output 10                |   |
+  |  11 | Input 11                 |  1 | Output 11                |   |
+  |  12 | DPlay1                   |  1 | Output 13                |   |
+  |  13 | DPlay2                   |  1 | Denc                     |   |
+  |  14 | Input 14                 |  1 | Output 14                | x |
+  |  15 | Input 15                 |  1 | Output 15                | x |
+  |  16 | Loopback                 |  1 | Loopback                 |   |
+  ----------------------------------------------------------------------
 
 Video outputs
-  --------------------------------------------------------------------
-  | ## | x | Video output name        | Connected video input    | s |
-  --------------------------------------------------------------------
-  |  1 | O | Enc1 1                   | Windows 3                |   |
-  |  2 | O | Enc1 2                   | Windows 2                |   |
-  |  3 | O | Enc1 3                   | Windows 1                |   |
-  |  4 | O | Enc1 4                   | Windows 1                |   |
-  |  5 |   | Output 5                 | Input 5                  | x |
-  |  6 |   | Output 6                 | Input 6                  | x |
-  |  7 |   | Output 7                 | Input 7                  | x |
-  |  8 |   | Output 8                 | Windows 4 HD             |   |
-  |  9 | O | Enc2 1                   | Windows 4 HD             | B |
-  | 10 |   | Output 10                | Input 10                 | B |
-  | 11 |   | Output 11                | Input 11                 | B |
-  | 12 | O | Denc                     | DPlay2                   | B |
-  | 13 | O | Output 13                | DPlay1                   | o |
-  | 14 |   | Output 14                | Input 14                 | o |
-  | 15 |   | Output 15                | Input 15                 | o |
-  | 16 | O | Loopback                 | Loopback                 | o |
-  --------------------------------------------------------------------
+  ---------------------------------------------------------------------
+  | ### | x | Video output name        | Connected video input    | s |
+  ---------------------------------------------------------------------
+  |   1 | O | Enc1 1                   | Windows 3                |   |
+  |   2 | O | Enc1 2                   | Windows 2                |   |
+  |   3 | O | Enc1 3                   | Windows 1                |   |
+  |   4 | O | Enc1 4                   | Windows 1                |   |
+  |   5 |   | Output 5                 | Input 5                  | x |
+  |   6 |   | Output 6                 | Input 6                  | x |
+  |   7 |   | Output 7                 | Input 7                  | x |
+  |   8 |   | Output 8                 | Windows 4 HD             |   |
+  |   9 | O | Enc2 1                   | Windows 4 HD             | B |
+  |  10 |   | Output 10                | Input 10                 | B |
+  |  11 |   | Output 11                | Input 11                 | B |
+  |  12 | O | Denc                     | DPlay2                   | B |
+  |  13 | O | Output 13                | DPlay1                   | o |
+  |  14 |   | Output 14                | Input 14                 | o |
+  |  15 |   | Output 15                | Input 15                 | o |
+  |  16 | O | Loopback                 | Loopback                 | o |
+  ---------------------------------------------------------------------
 
 Monitoring outputs
-  ----------------------------------------------------------------
-  | ## | x | Monitoring output name   | Connected video input    |
-  ----------------------------------------------------------------
-  |  1 |   | Monitor 1                | Windows 1                |
-  |  2 | O | Monitor 2                | Windows 2                |
-  |  3 | O | Monitor 3                | Windows 3                |
-  |  4 |   | Monitor 4                | Windows 4 HD             |
-  ----------------------------------------------------------------
+  -----------------------------------------------------------------
+  | ### | x | Monitoring output name   | Connected video input    |
+  -----------------------------------------------------------------
+  |   1 |   | Monitor 1                | Windows 1                |
+  |   2 | O | Monitor 2                | Windows 2                |
+  |   3 | O | Monitor 3                | Windows 3                |
+  |   4 |   | Monitor 4                | Windows 4 HD             |
+  -----------------------------------------------------------------
 
 Serial ports
-  ---------------------------------------------------------------
-  | ## | x | Dir  | Serial port        | Connected serial   | s |
-  ---------------------------------------------------------------
-  |  1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
-  |  2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
-  |  3 | O |  out | Deck 3             |                    | 4 |
-  |  4 |   | auto | Deck 4             |                    | 4 |
-  |  5 |   | auto | Serial 5           |                    |   |
-  |  6 |   | auto | Serial 6           |                    |   |
-  |  7 |   |   in | Serial 7           |                    | x |
-  |  8 |   |  out | Serial 8           |                    | x |
-  ---------------------------------------------------------------
+  ----------------------------------------------------------------
+  | ### | x | Dir  | Serial port        | Connected serial   | s |
+  ----------------------------------------------------------------
+  |   1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
+  |   2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
+  |   3 | O |  out | Deck 3             |                    | 4 |
+  |   4 |   | auto | Deck 4             |                    | 4 |
+  |   5 |   | auto | Serial 5           |                    |   |
+  |   6 |   | auto | Serial 6           |                    |   |
+  |   7 |   |   in | Serial 7           |                    | x |
+  |   8 |   |  out | Serial 8           |                    | x |
+  ----------------------------------------------------------------
 

test/test-04.ok

@@ -30,86 +30,86 @@ videohub: connect serial 6 "Serial 6" to serial 7 "Serial 7"
 videohub: disconnect serial 4 "Deck 4"
 videohub: disconnect serial 6 "Serial 6"
 Device info
-  -----------------------------------------------------------
-  | Device address             | sdi-matrix                 |
-  | Device port                | 9990                       |
-  | Model name                 | Blackmagic Micro Videohub  |
-  | Unique ID                  | 7c2e0d021714               |
-  | Protocol                   | 2.4                        |
-  | Video inputs               | 16                         |
-  | Video outputs              | 16                         |
-  | Serial ports               | 8                          |
-  | Video monitoring outputs   | 4                          |
-  -----------------------------------------------------------
+  -------------------------------------------------------------------
+  | Device address             | sdi-matrix                         |
+  | Device port                | 9990                               |
+  | Model name                 | Blackmagic Micro Videohub          |
+  | Unique ID                  | 7c2e0d021714                       |
+  | Protocol                   | 2.4                                |
+  | Video inputs               | 16                                 |
+  | Video outputs              | 16                                 |
+  | Serial ports               | 8                                  |
+  | Video monitoring outputs   | 4                                  |
+  -------------------------------------------------------------------
 
 Video inputs
-  --------------------------------------------------------------------
-  | ## | Video input name         | n | Routed to output         | s |
-  --------------------------------------------------------------------
-  |  1 | Windows 1                | 2 | Enc1 3                   | B |
-  |    |                          |   | Enc1 4                   |   |
-  |  2 | Windows 2                | 1 | Enc1 2                   | B |
-  |  3 | Windows 3                | 2 | Encoder 1                | B |
-  |    |                          |   | Output 5                 |   |
-  |  4 | Windows 4 HighDef        | 2 | Output 8                 | B |
-  |    |                          |   | Enc2 1                   |   |
-  |  5 | In 5                     | 0 | -                        | o |
-  |  6 | Camera 6                 | 1 | Output 6                 | o |
-  |  7 | Input 7                  | 1 | Output 7                 | o |
-  |  8 | Input 8                  | 0 | -                        | o |
-  |  9 | Input 9                  | 0 | -                        |   |
-  | 10 | Input 10                 | 1 | Output 10                |   |
-  | 11 | Input 11                 | 1 | Output 11                |   |
-  | 12 | DPlay1                   | 1 | Output 13                |   |
-  | 13 | DPlay2                   | 1 | Denc                     |   |
-  | 14 | Input 14                 | 1 | Output 14                | x |
-  | 15 | Input 15                 | 1 | Output 15                | x |
-  | 16 | Loopback                 | 1 | Dev-Lo                   |   |
-  --------------------------------------------------------------------
+  ----------------------------------------------------------------------
+  | ### | Video input name         | nn | Routed to output         | s |
+  ----------------------------------------------------------------------
+  |   1 | Windows 1                |  2 | Enc1 3                   | B |
+  |     |                          |    | Enc1 4                   |   |
+  |   2 | Windows 2                |  1 | Enc1 2                   | B |
+  |   3 | Windows 3                |  2 | Encoder 1                | B |
+  |     |                          |    | Output 5                 |   |
+  |   4 | Windows 4 HighDef        |  2 | Output 8                 | B |
+  |     |                          |    | Enc2 1                   |   |
+  |   5 | In 5                     |  0 | -                        | o |
+  |   6 | Camera 6                 |  1 | Output 6                 | o |
+  |   7 | Input 7                  |  1 | Output 7                 | o |
+  |   8 | Input 8                  |  0 | -                        | o |
+  |   9 | Input 9                  |  0 | -                        |   |
+  |  10 | Input 10                 |  1 | Output 10                |   |
+  |  11 | Input 11                 |  1 | Output 11                |   |
+  |  12 | DPlay1                   |  1 | Output 13                |   |
+  |  13 | DPlay2                   |  1 | Denc                     |   |
+  |  14 | Input 14                 |  1 | Output 14                | x |
+  |  15 | Input 15                 |  1 | Output 15                | x |
+  |  16 | Loopback                 |  1 | Dev-Lo                   |   |
+  ----------------------------------------------------------------------
 
 Video outputs
-  --------------------------------------------------------------------
-  | ## | x | Video output name        | Connected video input    | s |
-  --------------------------------------------------------------------
-  |  1 | L | Encoder 1                | Windows 3                |   |
-  |  2 | L | Enc1 2                   | Windows 2                |   |
-  |  3 | L | Enc1 3                   | Windows 1                |   |
-  |  4 | L | Enc1 4                   | Windows 1                |   |
-  |  5 |   | Output 5                 | Windows 3                | x |
-  |  6 | O | Output 6                 | Camera 6                 | x |
-  |  7 |   | Output 7                 | Input 7                  | x |
-  |  8 |   | Output 8                 | Windows 4 HighDef        |   |
-  |  9 |   | Enc2 1                   | Windows 4 HighDef        | B |
-  | 10 |   | Output 10                | Input 10                 | B |
-  | 11 |   | Output 11                | Input 11                 | B |
-  | 12 |   | Denc                     | DPlay2                   | B |
-  | 13 | O | Output 13                | DPlay1                   | o |
-  | 14 |   | Output 14                | Input 14                 | o |
-  | 15 | O | Output 15                | Input 15                 | o |
-  | 16 | O | Dev-Lo                   | Loopback                 | o |
-  --------------------------------------------------------------------
+  ---------------------------------------------------------------------
+  | ### | x | Video output name        | Connected video input    | s |
+  ---------------------------------------------------------------------
+  |   1 | L | Encoder 1                | Windows 3                |   |
+  |   2 | L | Enc1 2                   | Windows 2                |   |
+  |   3 | L | Enc1 3                   | Windows 1                |   |
+  |   4 | L | Enc1 4                   | Windows 1                |   |
+  |   5 |   | Output 5                 | Windows 3                | x |
+  |   6 | O | Output 6                 | Camera 6                 | x |
+  |   7 |   | Output 7                 | Input 7                  | x |
+  |   8 |   | Output 8                 | Windows 4 HighDef        |   |
+  |   9 |   | Enc2 1                   | Windows 4 HighDef        | B |
+  |  10 |   | Output 10                | Input 10                 | B |
+  |  11 |   | Output 11                | Input 11                 | B |
+  |  12 |   | Denc                     | DPlay2                   | B |
+  |  13 | O | Output 13                | DPlay1                   | o |
+  |  14 |   | Output 14                | Input 14                 | o |
+  |  15 | O | Output 15                | Input 15                 | o |
+  |  16 | O | Dev-Lo                   | Loopback                 | o |
+  ---------------------------------------------------------------------
 
 Monitoring outputs
-  ----------------------------------------------------------------
-  | ## | x | Monitoring output name   | Connected video input    |
-  ----------------------------------------------------------------
-  |  1 |   | PC 1 Mon                 | Windows 1                |
-  |  2 |   | Monitor 2                | Windows 2                |
-  |  3 | L | Loopback                 | Loopback                 |
-  |  4 | O | Decklink                 | Windows 4 HighDef        |
-  ----------------------------------------------------------------
+  -----------------------------------------------------------------
+  | ### | x | Monitoring output name   | Connected video input    |
+  -----------------------------------------------------------------
+  |   1 |   | PC 1 Mon                 | Windows 1                |
+  |   2 |   | Monitor 2                | Windows 2                |
+  |   3 | L | Loopback                 | Loopback                 |
+  |   4 | O | Decklink                 | Windows 4 HighDef        |
+  -----------------------------------------------------------------
 
 Serial ports
-  ---------------------------------------------------------------
-  | ## | x | Dir  | Serial port        | Connected serial   | s |
-  ---------------------------------------------------------------
-  |  1 |   |   in | Ren Ctrl 1         | Ren Deck 3         | 4 |
-  |  2 | O | auto | Serial Ctrl 2      | Ren Ctrl 1         | 4 |
-  |  3 | L |  out | Ren Deck 3         |                    | 4 |
-  |  4 |   | auto | Deck 4             |                    | 4 |
-  |  5 |   | auto | Serial 5           |                    |   |
-  |  6 |   |   in | Serial 6           |                    |   |
-  |  7 |   |  out | Serial 7           |                    | x |
-  |  8 |   | auto | Serial 8           |                    | x |
-  ---------------------------------------------------------------
+  ----------------------------------------------------------------
+  | ### | x | Dir  | Serial port        | Connected serial   | s |
+  ----------------------------------------------------------------
+  |   1 |   |   in | Ren Ctrl 1         | Ren Deck 3         | 4 |
+  |   2 | O | auto | Serial Ctrl 2      | Ren Ctrl 1         | 4 |
+  |   3 | L |  out | Ren Deck 3         |                    | 4 |
+  |   4 |   | auto | Deck 4             |                    | 4 |
+  |   5 |   | auto | Serial 5           |                    |   |
+  |   6 |   |   in | Serial 6           |                    |   |
+  |   7 |   |  out | Serial 7           |                    | x |
+  |   8 |   | auto | Serial 8           |                    | x |
+  ----------------------------------------------------------------
 

test/test-05.ok

@@ -1,83 +1,83 @@
 Device info
-  -----------------------------------------------------------
-  | Device address             | sdi-matrix                 |
-  | Device port                | 9990                       |
-  | Model name                 | Blackmagic Micro Videohub  |
-  | Unique ID                  | 7c2e0d021714               |
-  | Protocol                   | 2.4                        |
-  | Video inputs               | 16                         |
-  | Video outputs              | 16                         |
-  | Serial ports               | 8                          |
-  | Video monitoring outputs   | 4                          |
-  -----------------------------------------------------------
+  -------------------------------------------------------------------
+  | Device address             | sdi-matrix                         |
+  | Device port                | 9990                               |
+  | Model name                 | Blackmagic Micro Videohub          |
+  | Unique ID                  | 7c2e0d021714                       |
+  | Protocol                   | 2.4                                |
+  | Video inputs               | 16                                 |
+  | Video outputs              | 16                                 |
+  | Serial ports               | 8                                  |
+  | Video monitoring outputs   | 4                                  |
+  -------------------------------------------------------------------
 
 Video inputs
-  --------------------------------------------------------------------
-  | ## | Video input name         | n | Routed to output         | s |
-  --------------------------------------------------------------------
-  |  1 | Windows 1                | 2 | Enc1 3                   | B |
-  |    |                          |   | Enc1 4                   |   |
-  |  2 | Windows 2                | 1 | Enc1 2                   | B |
-  |  3 | Windows 3                | 1 | Enc1 1                   | B |
-  |  4 | Windows 4 HD             | 2 | Output 8                 | B |
-  |    |                          |   | Enc2 1                   |   |
-  |  5 | Input 5                  | 1 | Output 5                 | o |
-  |  6 | Input 6                  | 1 | Output 6                 | o |
-  |  7 | Input 7                  | 1 | Output 7                 | o |
-  |  8 | Input 8                  | 0 | -                        | o |
-  |  9 | Input 9                  | 0 | -                        |   |
-  | 10 | Input 10                 | 1 | Output 10                |   |
-  | 11 | Input 11                 | 1 | Output 11                |   |
-  | 12 | DPlay1                   | 1 | Output 13                |   |
-  | 13 | DPlay2                   | 1 | Denc                     |   |
-  | 14 | Input 14                 | 1 | Output 14                | x |
-  | 15 | Input 15                 | 1 | Output 15                | x |
-  | 16 | Loopback                 | 1 | Loopback                 |   |
-  --------------------------------------------------------------------
+  ----------------------------------------------------------------------
+  | ### | Video input name         | nn | Routed to output         | s |
+  ----------------------------------------------------------------------
+  |   1 | Windows 1                |  2 | Enc1 3                   | B |
+  |     |                          |    | Enc1 4                   |   |
+  |   2 | Windows 2                |  1 | Enc1 2                   | B |
+  |   3 | Windows 3                |  1 | Enc1 1                   | B |
+  |   4 | Windows 4 HD             |  2 | Output 8                 | B |
+  |     |                          |    | Enc2 1                   |   |
+  |   5 | Input 5                  |  1 | Output 5                 | o |
+  |   6 | Input 6                  |  1 | Output 6                 | o |
+  |   7 | Input 7                  |  1 | Output 7                 | o |
+  |   8 | Input 8                  |  0 | -                        | o |
+  |   9 | Input 9                  |  0 | -                        |   |
+  |  10 | Input 10                 |  1 | Output 10                |   |
+  |  11 | Input 11                 |  1 | Output 11                |   |
+  |  12 | DPlay1                   |  1 | Output 13                |   |
+  |  13 | DPlay2                   |  1 | Denc                     |   |
+  |  14 | Input 14                 |  1 | Output 14                | x |
+  |  15 | Input 15                 |  1 | Output 15                | x |
+  |  16 | Loopback                 |  1 | Loopback                 |   |
+  ----------------------------------------------------------------------
 
 Video outputs
-  --------------------------------------------------------------------
-  | ## | x | Video output name        | Connected video input    | s |
-  --------------------------------------------------------------------
-  |  1 | O | Enc1 1                   | Windows 3                |   |
-  |  2 | O | Enc1 2                   | Windows 2                |   |
-  |  3 | O | Enc1 3                   | Windows 1                |   |
-  |  4 | O | Enc1 4                   | Windows 1                |   |
-  |  5 |   | Output 5                 | Input 5                  | x |
-  |  6 |   | Output 6                 | Input 6                  | x |
-  |  7 |   | Output 7                 | Input 7                  | x |
-  |  8 |   | Output 8                 | Windows 4 HD             |   |
-  |  9 | O | Enc2 1                   | Windows 4 HD             | B |
-  | 10 |   | Output 10                | Input 10                 | B |
-  | 11 |   | Output 11                | Input 11                 | B |
-  | 12 | O | Denc                     | DPlay2                   | B |
-  | 13 | O | Output 13                | DPlay1                   | o |
-  | 14 |   | Output 14                | Input 14                 | o |
-  | 15 |   | Output 15                | Input 15                 | o |
-  | 16 | O | Loopback                 | Loopback                 | o |
-  --------------------------------------------------------------------
+  ---------------------------------------------------------------------
+  | ### | x | Video output name        | Connected video input    | s |
+  ---------------------------------------------------------------------
+  |   1 | O | Enc1 1                   | Windows 3                |   |
+  |   2 | O | Enc1 2                   | Windows 2                |   |
+  |   3 | O | Enc1 3                   | Windows 1                |   |
+  |   4 | O | Enc1 4                   | Windows 1                |   |
+  |   5 |   | Output 5                 | Input 5                  | x |
+  |   6 |   | Output 6                 | Input 6                  | x |
+  |   7 |   | Output 7                 | Input 7                  | x |
+  |   8 |   | Output 8                 | Windows 4 HD             |   |
+  |   9 | O | Enc2 1                   | Windows 4 HD             | B |
+  |  10 |   | Output 10                | Input 10                 | B |
+  |  11 |   | Output 11                | Input 11                 | B |
+  |  12 | O | Denc                     | DPlay2                   | B |
+  |  13 | O | Output 13                | DPlay1                   | o |
+  |  14 |   | Output 14                | Input 14                 | o |
+  |  15 |   | Output 15                | Input 15                 | o |
+  |  16 | O | Loopback                 | Loopback                 | o |
+  ---------------------------------------------------------------------
 
 Monitoring outputs
-  ----------------------------------------------------------------
-  | ## | x | Monitoring output name   | Connected video input    |
-  ----------------------------------------------------------------
-  |  1 |   | Monitor 1                | Windows 1                |
-  |  2 | O | Monitor 2                | Windows 2                |
-  |  3 | O | Monitor 3                | Windows 3                |
-  |  4 |   | Monitor 4                | Windows 4 HD             |
-  ----------------------------------------------------------------
+  -----------------------------------------------------------------
+  | ### | x | Monitoring output name   | Connected video input    |
+  -----------------------------------------------------------------
+  |   1 |   | Monitor 1                | Windows 1                |
+  |   2 | O | Monitor 2                | Windows 2                |
+  |   3 | O | Monitor 3                | Windows 3                |
+  |   4 |   | Monitor 4                | Windows 4 HD             |
+  -----------------------------------------------------------------
 
 Serial ports
-  ---------------------------------------------------------------
-  | ## | x | Dir  | Serial port        | Connected serial   | s |
-  ---------------------------------------------------------------
-  |  1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
-  |  2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
-  |  3 | O |  out | Deck 3             |                    | 4 |
-  |  4 |   | auto | Deck 4             |                    | 4 |
-  |  5 |   | auto | Serial 5           |                    |   |
-  |  6 |   | auto | Serial 6           |                    |   |
-  |  7 |   |   in | Serial 7           |                    | x |
-  |  8 |   |  out | Serial 8           |                    | x |
-  ---------------------------------------------------------------
+  ----------------------------------------------------------------
+  | ### | x | Dir  | Serial port        | Connected serial   | s |
+  ----------------------------------------------------------------
+  |   1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
+  |   2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
+  |   3 | O |  out | Deck 3             |                    | 4 |
+  |   4 |   | auto | Deck 4             |                    | 4 |
+  |   5 |   | auto | Serial 5           |                    |   |
+  |   6 |   | auto | Serial 6           |                    |   |
+  |   7 |   |   in | Serial 7           |                    | x |
+  |   8 |   |  out | Serial 8           |                    | x |
+  ----------------------------------------------------------------
 

test/test-07.ok

@@ -1,13 +1,13 @@
 Device info
-  -----------------------------------------------------------
-  | Device address             | sdi-matrix                 |
-  | Device port                | 9990                       |
-  | Model name                 | Blackmagic Micro Videohub  |
-  | Unique ID                  | 7c2e0d021714               |
-  | Protocol                   | 2.4                        |
-  | Video inputs               | 16                         |
-  | Video outputs              | 16                         |
-  | Serial ports               | 8                          |
-  | Video monitoring outputs   | 4                          |
-  -----------------------------------------------------------
+  -------------------------------------------------------------------
+  | Device address             | sdi-matrix                         |
+  | Device port                | 9990                               |
+  | Model name                 | Blackmagic Micro Videohub          |
+  | Unique ID                  | 7c2e0d021714                       |
+  | Protocol                   | 2.4                                |
+  | Video inputs               | 16                                 |
+  | Video outputs              | 16                                 |
+  | Serial ports               | 8                                  |
+  | Video monitoring outputs   | 4                                  |
+  -------------------------------------------------------------------
 

test/test-08.ok

@@ -1,24 +1,24 @@
 Video inputs
-  --------------------------------------------------------------------
-  | ## | Video input name         | n | Routed to output         | s |
-  --------------------------------------------------------------------
-  |  1 | Windows 1                | 2 | Enc1 3                   | B |
-  |    |                          |   | Enc1 4                   |   |
-  |  2 | Windows 2                | 1 | Enc1 2                   | B |
-  |  3 | Windows 3                | 1 | Enc1 1                   | B |
-  |  4 | Windows 4 HD             | 2 | Output 8                 | B |
-  |    |                          |   | Enc2 1                   |   |
-  |  5 | Input 5                  | 1 | Output 5                 | o |
-  |  6 | Input 6                  | 1 | Output 6                 | o |
-  |  7 | Input 7                  | 1 | Output 7                 | o |
-  |  8 | Input 8                  | 0 | -                        | o |
-  |  9 | Input 9                  | 0 | -                        |   |
-  | 10 | Input 10                 | 1 | Output 10                |   |
-  | 11 | Input 11                 | 1 | Output 11                |   |
-  | 12 | DPlay1                   | 1 | Output 13                |   |
-  | 13 | DPlay2                   | 1 | Denc                     |   |
-  | 14 | Input 14                 | 1 | Output 14                | x |
-  | 15 | Input 15                 | 1 | Output 15                | x |
-  | 16 | Loopback                 | 1 | Loopback                 |   |
-  --------------------------------------------------------------------
+  ----------------------------------------------------------------------
+  | ### | Video input name         | nn | Routed to output         | s |
+  ----------------------------------------------------------------------
+  |   1 | Windows 1                |  2 | Enc1 3                   | B |
+  |     |                          |    | Enc1 4                   |   |
+  |   2 | Windows 2                |  1 | Enc1 2                   | B |
+  |   3 | Windows 3                |  1 | Enc1 1                   | B |
+  |   4 | Windows 4 HD             |  2 | Output 8                 | B |
+  |     |                          |    | Enc2 1                   |   |
+  |   5 | Input 5                  |  1 | Output 5                 | o |
+  |   6 | Input 6                  |  1 | Output 6                 | o |
+  |   7 | Input 7                  |  1 | Output 7                 | o |
+  |   8 | Input 8                  |  0 | -                        | o |
+  |   9 | Input 9                  |  0 | -                        |   |
+  |  10 | Input 10                 |  1 | Output 10                |   |
+  |  11 | Input 11                 |  1 | Output 11                |   |
+  |  12 | DPlay1                   |  1 | Output 13                |   |
+  |  13 | DPlay2                   |  1 | Denc                     |   |
+  |  14 | Input 14                 |  1 | Output 14                | x |
+  |  15 | Input 15                 |  1 | Output 15                | x |
+  |  16 | Loopback                 |  1 | Loopback                 |   |
+  ----------------------------------------------------------------------
 

test/test-09.ok

@@ -1,22 +1,22 @@
 Video outputs
-  --------------------------------------------------------------------
-  | ## | x | Video output name        | Connected video input    | s |
-  --------------------------------------------------------------------
-  |  1 | L | Enc1 1                   | Windows 3                |   |
-  |  2 | L | Enc1 2                   | Windows 2                |   |
-  |  3 | L | Enc1 3                   | Windows 1                |   |
-  |  4 | L | Enc1 4                   | Windows 1                |   |
-  |  5 |   | Output 5                 | Input 5                  | x |
-  |  6 |   | Output 6                 | Input 6                  | x |
-  |  7 |   | Output 7                 | Input 7                  | x |
-  |  8 |   | Output 8                 | Windows 4 HD             |   |
-  |  9 | L | Enc2 1                   | Windows 4 HD             | B |
-  | 10 |   | Output 10                | Input 10                 | B |
-  | 11 |   | Output 11                | Input 11                 | B |
-  | 12 | L | Denc                     | DPlay2                   | B |
-  | 13 | O | Output 13                | DPlay1                   | o |
-  | 14 |   | Output 14                | Input 14                 | o |
-  | 15 |   | Output 15                | Input 15                 | o |
-  | 16 | O | Loopback                 | Loopback                 | o |
-  --------------------------------------------------------------------
+  ---------------------------------------------------------------------
+  | ### | x | Video output name        | Connected video input    | s |
+  ---------------------------------------------------------------------
+  |   1 | L | Enc1 1                   | Windows 3                |   |
+  |   2 | L | Enc1 2                   | Windows 2                |   |
+  |   3 | L | Enc1 3                   | Windows 1                |   |
+  |   4 | L | Enc1 4                   | Windows 1                |   |
+  |   5 |   | Output 5                 | Input 5                  | x |
+  |   6 |   | Output 6                 | Input 6                  | x |
+  |   7 |   | Output 7                 | Input 7                  | x |
+  |   8 |   | Output 8                 | Windows 4 HD             |   |
+  |   9 | L | Enc2 1                   | Windows 4 HD             | B |
+  |  10 |   | Output 10                | Input 10                 | B |
+  |  11 |   | Output 11                | Input 11                 | B |
+  |  12 | L | Denc                     | DPlay2                   | B |
+  |  13 | O | Output 13                | DPlay1                   | o |
+  |  14 |   | Output 14                | Input 14                 | o |
+  |  15 |   | Output 15                | Input 15                 | o |
+  |  16 | O | Loopback                 | Loopback                 | o |
+  ---------------------------------------------------------------------
 

test/test-14.ok

@@ -24,72 +24,72 @@ Please report this line to author's email: georgi@unixsol.org
 WARNING: SERIAL PORT STATUS command returned unknown status: 'Thunderbolt'
 Please report this line to author's email: georgi@unixsol.org
 Device info
-  -----------------------------------------------------------
-  | Device address             | sdi-matrix                 |
-  | Device port                | 9990                       |
-  | Model name                 | Blackmagic Micro Videohub  |
-  | Unique ID                  | 7c2e0d021714               |
-  | Protocol                   | 2.4                        |
-  | Video inputs               | 16                         |
-  | Video outputs              | 16                         |
-  | Serial ports               | 4                          |
-  -----------------------------------------------------------
+  -------------------------------------------------------------------
+  | Device address             | sdi-matrix                         |
+  | Device port                | 9990                               |
+  | Model name                 | Blackmagic Micro Videohub          |
+  | Unique ID                  | 7c2e0d021714                       |
+  | Protocol                   | 2.4                                |
+  | Video inputs               | 16                                 |
+  | Video outputs              | 16                                 |
+  | Serial ports               | 4                                  |
+  -------------------------------------------------------------------
 
 Video inputs
-  --------------------------------------------------------------------
-  | ## | Video input name         | n | Routed to output         | s |
-  --------------------------------------------------------------------
-  |  1 | Windows 1                | 4 | Enc1 3                   |   |
-  |    |                          |   | Enc1 4                   |   |
-  |    |                          |   | Output 7                 |   |
-  |    |                          |   | Output 10                |   |
-  |  2 | Windows 2                | 1 | Enc1 2                   |   |
-  |  3 | Windows 3                | 1 | Enc1 1                   |   |
-  |  4 | Windows 4 HD             | 2 |                          |   |
-  |    |                          |   | Enc2 1                   |   |
-  |  5 | Input 5                  | 1 | Output 5                 |   |
-  |  6 | Input 6                  | 1 | Output 6                 |   |
-  |  7 |                          | 0 | -                        |   |
-  |  8 | Input 8                  | 0 | -                        |   |
-  |  9 | Input 9                  | 0 | -                        |   |
-  | 10 | Input 10                 | 0 | -                        |   |
-  | 11 | Input 11                 | 1 | Output 11                |   |
-  | 12 | DPlay1                   | 1 | Output 13                |   |
-  | 13 | DPlay2                   | 1 | Denc                     |   |
-  | 14 | Input 14                 | 1 | Output 14                |   |
-  | 15 | Input 15                 | 1 | Output 15                |   |
-  | 16 | Loopback                 | 1 | Loopback                 |   |
-  --------------------------------------------------------------------
+  ----------------------------------------------------------------------
+  | ### | Video input name         | nn | Routed to output         | s |
+  ----------------------------------------------------------------------
+  |   1 | Windows 1                |  4 | Enc1 3                   |   |
+  |     |                          |    | Enc1 4                   |   |
+  |     |                          |    | Output 7                 |   |
+  |     |                          |    | Output 10                |   |
+  |   2 | Windows 2                |  1 | Enc1 2                   |   |
+  |   3 | Windows 3                |  1 | Enc1 1                   |   |
+  |   4 | Windows 4 HD             |  2 |                          |   |
+  |     |                          |    | Enc2 1                   |   |
+  |   5 | Input 5                  |  1 | Output 5                 |   |
+  |   6 | Input 6                  |  1 | Output 6                 |   |
+  |   7 |                          |  0 | -                        |   |
+  |   8 | Input 8                  |  0 | -                        |   |
+  |   9 | Input 9                  |  0 | -                        |   |
+  |  10 | Input 10                 |  0 | -                        |   |
+  |  11 | Input 11                 |  1 | Output 11                |   |
+  |  12 | DPlay1                   |  1 | Output 13                |   |
+  |  13 | DPlay2                   |  1 | Denc                     |   |
+  |  14 | Input 14                 |  1 | Output 14                |   |
+  |  15 | Input 15                 |  1 | Output 15                |   |
+  |  16 | Loopback                 |  1 | Loopback                 |   |
+  ----------------------------------------------------------------------
 
 Video outputs
-  --------------------------------------------------------------------
-  | ## | x | Video output name        | Connected video input    | s |
-  --------------------------------------------------------------------
-  |  1 | L | Enc1 1                   | Windows 3                | B |
-  |  2 | L | Enc1 2                   | Windows 2                | x |
-  |  3 | L | Enc1 3                   | Windows 1                | o |
-  |  4 | L | Enc1 4                   | Windows 1                | T |
-  |  5 |   | Output 5                 | Input 5                  |   |
-  |  6 |   | Output 6                 | Input 6                  |   |
-  |  7 |   | Output 7                 | Windows 1                |   |
-  |  8 |   |                          | Windows 4 HD             |   |
-  |  9 | L | Enc2 1                   | Windows 4 HD             |   |
-  | 10 |   | Output 10                | Windows 1                |   |
-  | 11 |   | Output 11                | Input 11                 |   |
-  | 12 | L | Denc                     | DPlay2                   |   |
-  | 13 | O | Output 13                | DPlay1                   |   |
-  | 14 |   | Output 14                | Input 14                 |   |
-  | 15 |   | Output 15                | Input 15                 |   |
-  | 16 |   | Loopback                 | Loopback                 |   |
-  --------------------------------------------------------------------
+  ---------------------------------------------------------------------
+  | ### | x | Video output name        | Connected video input    | s |
+  ---------------------------------------------------------------------
+  |   1 | L | Enc1 1                   | Windows 3                | B |
+  |   2 | L | Enc1 2                   | Windows 2                | x |
+  |   3 | L | Enc1 3                   | Windows 1                | o |
+  |   4 | L | Enc1 4                   | Windows 1                | T |
+  |   5 |   | Output 5                 | Input 5                  |   |
+  |   6 |   | Output 6                 | Input 6                  |   |
+  |   7 |   | Output 7                 | Windows 1                |   |
+  |   8 |   |                          | Windows 4 HD             |   |
+  |   9 | L | Enc2 1                   | Windows 4 HD             |   |
+  |  10 |   | Output 10                | Windows 1                |   |
+  |  11 |   | Output 11                | Input 11                 |   |
+  |  12 | L | Denc                     | DPlay2                   |   |
+  |  13 | O | Output 13                | DPlay1                   |   |
+  |  14 |   | Output 14                | Input 14                 |   |
+  |  15 |   | Output 15                | Input 15                 |   |
+  |  16 |   | Loopback                 | Loopback                 |   |
+  ---------------------------------------------------------------------
 
 Serial ports
-  ---------------------------------------------------------------
-  | ## | x | Dir  | Serial port        | Connected serial   | s |
-  ---------------------------------------------------------------
-  |  1 |   | auto | Remote 1           |                    |   |
-  |  2 |   |   in | Remote 2           |                    |   |
-  |  3 |   |  out | Remote 3           |                    |   |
-  |  4 |   | auto | Remote 4           |                    | 4 |
-  ---------------------------------------------------------------
+  ----------------------------------------------------------------
+  | ### | x | Dir  | Serial port        | Connected serial   | s |
+  ----------------------------------------------------------------
+  |   1 |   | auto | Remote 1           |                    |   |
+  |   2 |   |   in | Remote 2           |                    |   |
+  |   3 |   |  out | Remote 3           |                    |   |
+  |   4 |   | auto | Remote 4           |                    | 4 |
+  ----------------------------------------------------------------
 

test/test-15.ok

@@ -1,10 +1,10 @@
 Monitoring outputs
-  ----------------------------------------------------------------
-  | ## | x | Monitoring output name   | Connected video input    |
-  ----------------------------------------------------------------
-  |  1 |   | Monitor 1                | Windows 1                |
-  |  2 | O | Monitor 2                | Windows 2                |
-  |  3 | L | Monitor 3                | Windows 3                |
-  |  4 |   | Monitor 4                | Windows 4 HD             |
-  ----------------------------------------------------------------
+  -----------------------------------------------------------------
+  | ### | x | Monitoring output name   | Connected video input    |
+  -----------------------------------------------------------------
+  |   1 |   | Monitor 1                | Windows 1                |
+  |   2 | O | Monitor 2                | Windows 2                |
+  |   3 | L | Monitor 3                | Windows 3                |
+  |   4 |   | Monitor 4                | Windows 4 HD             |
+  -----------------------------------------------------------------
 

test/test-16.ok

@@ -1,14 +1,14 @@
 Serial ports
-  ---------------------------------------------------------------
-  | ## | x | Dir  | Serial port        | Connected serial   | s |
-  ---------------------------------------------------------------
-  |  1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
-  |  2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
-  |  3 | L |  out | Deck 3             |                    | 4 |
-  |  4 |   | auto | Deck 4             |                    | 4 |
-  |  5 |   | auto | Serial 5           |                    |   |
-  |  6 |   | auto | Serial 6           |                    |   |
-  |  7 |   |   in | Serial 7           |                    | x |
-  |  8 |   |  out | Serial 8           |                    | x |
-  ---------------------------------------------------------------
+  ----------------------------------------------------------------
+  | ### | x | Dir  | Serial port        | Connected serial   | s |
+  ----------------------------------------------------------------
+  |   1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
+  |   2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
+  |   3 | L |  out | Deck 3             |                    | 4 |
+  |   4 |   | auto | Deck 4             |                    | 4 |
+  |   5 |   | auto | Serial 5           |                    |   |
+  |   6 |   | auto | Serial 6           |                    |   |
+  |   7 |   |   in | Serial 7           |                    | x |
+  |   8 |   |  out | Serial 8           |                    | x |
+  ----------------------------------------------------------------
 

test/test-17.ok

@@ -0,0 +1,213 @@
+WARNING: VIDEOHUB DEVICE command sent unknown line: 'Friendly name: SDI router on the 5th floor'
+Please report this line to author's email: georgi@unixsol.org
+WARNING: VIDEOHUB DEVICE command sent unknown line: 'Debug mode: true'
+Please report this line to author's email: georgi@unixsol.org
+WARNING: VIDEOHUB DEVICE command sent unknown line: 'Debug mode: yes'
+Please report this line to author's email: georgi@unixsol.org
+WARNING: VIDEOHUB DEVICE command sent unknown line: 'Power: both'
+Please report this line to author's email: georgi@unixsol.org
+WARNING: Videohub sent unknown command!
+         Please report this command to author's email: georgi@unixsol.org
+         You may use -q or --quiet to suppress the message.
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+ALARM STATUS:
+0 Error
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+WARNING: Videohub sent unknown command!
+         Please report this command to author's email: georgi@unixsol.org
+         You may use -q or --quiet to suppress the message.
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+END PRELUDE:
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+WARNING: Videohub sent unknown command!
+         Please report this command to author's email: georgi@unixsol.org
+         You may use -q or --quiet to suppress the message.
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+ENGINEERING:
+0 Hack
+1 Hack
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+WARNING: Videohub sent unknown command!
+         Please report this command to author's email: georgi@unixsol.org
+         You may use -q or --quiet to suppress the message.
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+FRAME LABELS:
+0 gf-Frame 1
+1 Frame 2
+2 gf-Frame 3
+3 Frame 4
+4 gf-Frame 5
+5 Frame 6
+6 gf-Frame 7
+7 Frame 8
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+WARNING: Videohub sent unknown command!
+         Please report this command to author's email: georgi@unixsol.org
+         You may use -q or --quiet to suppress the message.
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+FRAME BUFFER ROUTING:
+0 Frame 4
+1 gf-Frame 3
+2 Frame 6
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+WARNING: Videohub sent unknown command!
+         Please report this command to author's email: georgi@unixsol.org
+         You may use -q or --quiet to suppress the message.
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+FRAME BUFFER LOCKS:
+0 U
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+WARNING: Videohub sent unknown command!
+         Please report this command to author's email: georgi@unixsol.org
+         You may use -q or --quiet to suppress the message.
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+PROCESSING UNIT ROUTING:
+0 Output 15
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+WARNING: Videohub sent unknown command!
+         Please report this command to author's email: georgi@unixsol.org
+         You may use -q or --quiet to suppress the message.
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+PROCESSING UNIT LOCKS:
+0 U
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+WARNING: Videohub sent unknown command!
+         Please report this command to author's email: georgi@unixsol.org
+         You may use -q or --quiet to suppress the message.
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+ALARM STATUS:
+0 Error
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+WARNING: Videohub sent unknown command!
+         Please report this command to author's email: georgi@unixsol.org
+         You may use -q or --quiet to suppress the message.
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+END PRELUDE:
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+WARNING: Videohub sent unknown command!
+         Please report this command to author's email: georgi@unixsol.org
+         You may use -q or --quiet to suppress the message.
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+ENGINEERING:
+0 Debug
+---------8<-----------8<----------- cut here ---------8<------------8<---------
+Device info
+  -------------------------------------------------------------------
+  | Device address             | sdi-matrix                         |
+  | Device port                | 9990                               |
+  | Model name                 | Blackmagic Workgroup Videohub      |
+  | Unique ID                  | 465647757584                       |
+  | Protocol                   | 2.4                                |
+  | Video inputs               | 16                                 |
+  | Video outputs              | 32                                 |
+  | Serial ports               | 8                                  |
+  | Video processing units     | 16                                 |
+  | Video monitoring outputs   | 8                                  |
+  -------------------------------------------------------------------
+
+Video inputs
+  ----------------------------------------------------------------------
+  | ### | Video input name         | nn | Routed to output         | s |
+  ----------------------------------------------------------------------
+  |   1 | Windows 1                | 18 | Enc1 3                   | B |
+  |     |                          |    | Enc1 4                   |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |     |                          |    |                          |   |
+  |   2 | Windows 2                |  1 | Enc1 2                   | B |
+  |   3 | Windows 3                |  1 | Enc1 1                   | B |
+  |   4 | Windows 4 HD             |  2 | Output 8                 | B |
+  |     |                          |    | Enc2 1                   |   |
+  |   5 | Input 5                  |  1 | Output 5                 | o |
+  |   6 | Input 6                  |  1 | Output 6                 | o |
+  |   7 | Input 7                  |  1 | Output 7                 | o |
+  |   8 | Input 8                  |  0 | -                        | o |
+  |   9 | Input 9                  |  0 | -                        |   |
+  |  10 | Input 10                 |  1 | Output 10                |   |
+  |  11 | Input 11                 |  1 | Output 11                |   |
+  |  12 | DPlay1                   |  1 | Output 13                |   |
+  |  13 | DPlay2                   |  1 | Denc                     |   |
+  |  14 | Input 14                 |  1 | Output 14                | x |
+  |  15 | Input 15                 |  1 | Output 15                | x |
+  |  16 | Loopback                 |  1 | Loopback                 |   |
+  ----------------------------------------------------------------------
+
+Video outputs
+  ---------------------------------------------------------------------
+  | ### | x | Video output name        | Connected video input    | s |
+  ---------------------------------------------------------------------
+  |   1 | L | Enc1 1                   | Windows 3                |   |
+  |   2 | L | Enc1 2                   | Windows 2                |   |
+  |   3 | L | Enc1 3                   | Windows 1                |   |
+  |   4 | L | Enc1 4                   | Windows 1                |   |
+  |   5 |   | Output 5                 | Input 5                  | x |
+  |   6 |   | Output 6                 | Input 6                  | x |
+  |   7 |   | Output 7                 | Input 7                  | x |
+  |   8 |   | Output 8                 | Windows 4 HD             |   |
+  |   9 | L | Enc2 1                   | Windows 4 HD             | B |
+  |  10 |   | Output 10                | Input 10                 | B |
+  |  11 |   | Output 11                | Input 11                 | B |
+  |  12 | L | Denc                     | DPlay2                   | B |
+  |  13 | O | Output 13                | DPlay1                   | o |
+  |  14 |   | Output 14                | Input 14                 | o |
+  |  15 |   | Output 15                | Input 15                 | o |
+  |  16 | O | Loopback                 | Loopback                 | o |
+  |  17 |   |                          | Windows 1                |   |
+  |  18 |   |                          | Windows 1                |   |
+  |  19 |   |                          | Windows 1                |   |
+  |  20 |   |                          | Windows 1                |   |
+  |  21 |   |                          | Windows 1                |   |
+  |  22 |   |                          | Windows 1                |   |
+  |  23 |   |                          | Windows 1                |   |
+  |  24 |   |                          | Windows 1                |   |
+  |  25 |   |                          | Windows 1                |   |
+  |  26 |   |                          | Windows 1                |   |
+  |  27 |   |                          | Windows 1                |   |
+  |  28 |   |                          | Windows 1                |   |
+  |  29 |   |                          | Windows 1                |   |
+  |  30 |   |                          | Windows 1                |   |
+  |  31 |   |                          | Windows 1                |   |
+  |  32 |   |                          | Windows 1                |   |
+  ---------------------------------------------------------------------
+
+Monitoring outputs
+  -----------------------------------------------------------------
+  | ### | x | Monitoring output name   | Connected video input    |
+  -----------------------------------------------------------------
+  |   1 |   | Monitor 1                | Windows 1                |
+  |   2 | O | Monitor 2                | Windows 2                |
+  |   3 | L | Monitor 3                | Windows 3                |
+  |   4 |   | Monitor 4                | Windows 4 HD             |
+  |   5 |   |                          | Windows 1                |
+  |   6 |   |                          | Windows 1                |
+  |   7 |   |                          | Windows 1                |
+  |   8 |   |                          | Windows 1                |
+  -----------------------------------------------------------------
+
+Serial ports
+  ----------------------------------------------------------------
+  | ### | x | Dir  | Serial port        | Connected serial   | s |
+  ----------------------------------------------------------------
+  |   1 | O |   in | Serial Ctrl 1      | Deck 3             | 4 |
+  |   2 |   | auto | Serial Ctrl 2      | Deck 4             | 4 |
+  |   3 | L |  out | Deck 3             |                    | 4 |
+  |   4 |   | auto | Deck 4             |                    | 4 |
+  |   5 |   | auto | Serial 5           |                    |   |
+  |   6 |   | auto | Serial 6           |                    |   |
+  |   7 |   |   in | Serial 7           |                    | x |
+  |   8 |   |  out | Serial 8           |                    | x |
+  ----------------------------------------------------------------
+