Change output formatting to better show port locks and numbers.

Show port numbers next to inputs and outputs and locks next to
outputs to better reflect the logic for their manipulation.

ChangeLog

@@ -3,6 +3,7 @@ xxxx-xx-xx : Version next
  * Rename -v / --verbose parameter to -d / --debug.
  * Rename -h parameter (help) to -H.
  * Rename -s parameter (host) to -h.
+ * Change output formatting to better show port locks and numbers.
 
 2014-11-27 : Version 0.2
  * Fix port routing. Previously it was reversed and incorrect.

README

@@ -115,26 +115,26 @@ Video outputs: 16
 Video monitoring outputs: 0
 Serial ports: 0
 
-----------------------------------------------------------------------
-|  # | x | Input name                  | Output name                 |
-----------------------------------------------------------------------
-|  1 | L | Windows 3                   | Enc1 1                      |
-|  2 | L | Windows 2                   | Enc1 2                      |
-|  3 | L | Windows 1                   | Enc1 3                      |
-|  4 | L | Windows 1                   | Enc1 4                      |
-|  5 |   | Input 5                     | Output 5                    |
-|  6 | O | Input 6                     | Output 6                    |
-|  7 |   | Input 7                     | Output 7                    |
-|  8 |   | Input 8                     | Output 8                    |
-|  9 | L | Windows 4 HD                | Enc2 1                      |
-| 10 |   | Windows 4 HD                | Output 10                   |
-| 11 |   | Input 11                    | Output 11                   |
-| 12 | L | DPlay2                      | Denc                        |
-| 13 | L | DPlay1                      | Output 13                   |
-| 14 |   | Input 14                    | Output 14                   |
-| 15 | O | Input 15                    | Output 15                   |
-| 16 |   | Loopback                    | Loopback                    |
-----------------------------------------------------------------------
+-----------------------------------------------------------------------
+| i# | Input name                | o# | x | Output name               |
+-----------------------------------------------------------------------
+|  1 | Windows 3                 |  1 | L | Enc1 1                    |
+|  2 | Windows 2                 |  2 | L | Enc1 2                    |
+|  3 | Windows 1                 |  3 | L | Enc1 3                    |
+|  4 | Windows 1                 |  4 | L | Enc1 4                    |
+|  5 | Input 5                   |  5 |   | Output 5                  |
+|  6 | Input 6                   |  6 |   | Output 6                  |
+|  7 | Input 7                   |  7 |   | Output 7                  |
+|  8 | Input 8                   |  8 |   | Output 8                  |
+|  9 | Windows 4 HD              |  9 | L | Enc2 1                    |
+| 10 | Input 10                  | 10 |   | Output 10                 |
+| 11 | Input 11                  | 11 |   | Output 11                 |
+| 12 | DPlay2                    | 12 | L | Denc                      |
+| 13 | DPlay1                    | 13 | O | Output 13                 |
+| 14 | Input 14                  | 14 |   | Output 14                 |
+| 15 | Input 15                  | 15 |   | Output 15                 |
+| 16 | Loopback                  | 16 |   | Loopback                  |
+-----------------------------------------------------------------------
 
 gf@gf:~/git/videohubctrl$
 |----------------------------------------------------------------------|
@@ -142,12 +142,13 @@ gf@gf:~/git/videohubctrl$
 Output Legend
 =============
 
- Column 1 (#) - Port number
- Column 2 (x) - Output lock status
-                  L - The port is locked by another user (IP address)
-                  O - The port is locked by my me (my IP address)
- Column 3     - List of the inputs and their names
- Column 4     - List of the outputs and their names
+ Column 1 (i#) - Input port number
+ Column 2 (..) - Input port names
+ Column 3 (o#) - Output port number
+ Column 4 (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 5      - Output port names
 
 
 Reporting bugs

videohubctrl.c

@@ -137,18 +137,19 @@ static void printf_line(int len) {
 static void print_device_settings(struct videohub_data *d) {
 	unsigned int i;
 	printf("\n");
-	printf_line(70);
-	printf("|  # | x | %-27s | %-27s |\n", "Input name", "Output name");
-	printf_line(70);
+	printf_line(71);
+	printf("| i# | %-25s | o# | x | %-25s |\n", "Input name", "Output name");
+	printf_line(71);
 	for(i = 0; i < MIN(d->device.num_video_outputs, ARRAY_SIZE(d->outputs)); i++) {
-		printf("| %2d | %c | %-27s | %-27s |\n",
+		printf("| %2d | %-25s | %2d | %c | %-25s |\n",
 			i + 1,
-			d->outputs[i].locked ? (d->outputs[i].locked_other ? 'L' : 'O') : ' ',
 			d->inputs[d->outputs[i].routed_to].name,
+			i + 1,
+			d->outputs[i].locked ? (d->outputs[i].locked_other ? 'L' : 'O') : ' ',
 			d->outputs[i].name
 		);
 	}
-	printf_line(70);
+	printf_line(71);
 }
 
 static int read_device_command_stream(struct videohub_data *d) {