Rename --vo-route parameter to --vo-input.

ChangeLog

@@ -7,6 +7,7 @@
    in text file by using -T / --test-input option.
  * Add support for port statuses (types) which are reported by
    Universal Videohub.
+ * Rename --vo-route parameter to --vo-input.
 
 2014-11-28 : Version 0.3
  * Rename -v / --verbose parameter to -d / --debug.

README

@@ -54,17 +54,15 @@ Commands:
  --list-vinputs             | List device video inputs.
  --list-voutputs            | List device video outputs.
 
-Video input/output configuration:
+Video inputs configuration:
  --vi-name <in_X> <name>    | Set video input port X name.
+
+Video outputs configuration:
  --vo-name <out_X> <name>   | Set video output port X name.
-
- --vo-route <out_X> <in_Y>  | Connect video output X to video input Y
-
+ --vo-input <out_X> <in_Y>  | Connect video output X to video input Y
  --vo-lock <out_X>          | Lock output port X.
  --vo-unlock <out_X>        | Unlock output port X.
 
-   For <in_X/out_X/in_Y> you may use port number or port name.
-
 Misc options:
  -T --test-input <file>     | Read commands from <file>.
  -d --debug                 | Increase logging verbosity.
@@ -113,8 +111,8 @@ Example usage
 
  # Set two outputs to receive from the same input using port names
 
-   videohubctrl -h sdi --vo-route "Output 8" "Windows 4 HD"
-   videohubctrl -h sdi --vo-route "Output 7" "Windows 4 HD"
+   videohubctrl -h sdi --vo-input "Output 8" "Windows 4 HD"
+   videohubctrl -h sdi --vo-input "Output 7" "Windows 4 HD"
 
 
  # Run several commands at once
@@ -127,7 +125,7 @@ Example usage
                 --vi-name 11 "Test input" \
                 --vi-name 12 "Playout input" \
                 --vo-name 5 "Encoder h264" \
-                --vo-route 5 12 \
+                --vo-input 5 12 \
                 --vo-lock 5
 
 

display.c

@@ -136,7 +136,7 @@ static void __print_opt(struct videohub_data *d, enum vcmd vcmd) {
 			printf("  --%s-name %2d \"%s\" \\\n", p, i + 1, s_port->port[i].name);
 			break;
 		case PARSE_ROUTE:
-			printf("  --%s-route %2d %2d \\\n", p, i + 1, s_port->port[i].routed_to + 1);
+			printf("  --%s-input %2d %2d \\\n", p, i + 1, s_port->port[i].routed_to + 1);
 			break;
 		case PARSE_LOCK:
 			last = i + 1 < s_port->num;

test/run

@@ -41,9 +41,9 @@ videohubctrl --test-input test/input-00.txt \
 	--vo-lock "Output 15" \
 	--vo-unlock 12 \
 	--vo-unlock "Enc2 1" \
-	--vo-route "Output 5" "Windows 1" \
-	--vo-route 5 2 \
-	--vo-route 5 "Windows 3" \
+	--vo-input "Output 5" "Windows 1" \
+	--vo-input 5 2 \
+	--vo-input 5 "Windows 3" \
 $@ &> test/test-04.out
 check test/test-04 "Test multiple configuration commands"
 
@@ -60,15 +60,15 @@ check test/test-05 "Test if --backup restored correct config."
 ./videohubctrl --test-input test/input-00.txt --vo-lock "Output 18"                  $@ &>> test/test-06.out
 ./videohubctrl --test-input test/input-00.txt --vo-unlock 18                         $@ &>> test/test-06.out
 ./videohubctrl --test-input test/input-00.txt --vo-unlock "Output 18"                $@ &>> test/test-06.out
-./videohubctrl --test-input test/input-00.txt --vo-route 0 0                         $@ &>> test/test-06.out
-./videohubctrl --test-input test/input-00.txt --vo-route 0 18                        $@ &>> test/test-06.out
-./videohubctrl --test-input test/input-00.txt --vo-route 18 0                        $@ &>> test/test-06.out
-./videohubctrl --test-input test/input-00.txt --vo-route 18 18                       $@ &>> test/test-06.out
-./videohubctrl --test-input test/input-00.txt --vo-route 1  18                       $@ &>> test/test-06.out
-./videohubctrl --test-input test/input-00.txt --vo-route 18 1                        $@ &>> test/test-06.out
-./videohubctrl --test-input test/input-00.txt --vo-route "Input 10" "Output 10"      $@ &>> test/test-06.out
-./videohubctrl --test-input test/input-00.txt --vo-route "Err Output" "Input 10"     $@ &>> test/test-06.out
-./videohubctrl --test-input test/input-00.txt --vo-route "Output 10" "Err Input"     $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --vo-input 0 0                         $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --vo-input 0 18                        $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --vo-input 18 0                        $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --vo-input 18 18                       $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --vo-input 1  18                       $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --vo-input 18 1                        $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --vo-input "Input 10" "Output 10"      $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --vo-input "Err Output" "Input 10"     $@ &>> test/test-06.out
+./videohubctrl --test-input test/input-00.txt --vo-input "Output 10" "Err Input"     $@ &>> test/test-06.out
 check test/test-06 "Test errors on commands with invalid ports."
 
 videohubctrl --test-input test/input-00.txt --list-device $@ &> test/test-07.out

test/test-02.ok

@@ -31,22 +31,22 @@ videohubctrl \
   --vo-name 14 "Output 14" \
   --vo-name 15 "Output 15" \
   --vo-name 16 "Loopback" \
-  --vo-route  1  3 \
-  --vo-route  2  2 \
-  --vo-route  3  1 \
-  --vo-route  4  1 \
-  --vo-route  5  5 \
-  --vo-route  6  6 \
-  --vo-route  7  7 \
-  --vo-route  8  4 \
-  --vo-route  9  4 \
-  --vo-route 10 10 \
-  --vo-route 11 11 \
-  --vo-route 12 13 \
-  --vo-route 13 12 \
-  --vo-route 14 14 \
-  --vo-route 15 15 \
-  --vo-route 16 16 \
+  --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 \
   --vo-unlock  1 --vo-lock  1 \
   --vo-unlock  2 --vo-lock  2 \
   --vo-unlock  3 --vo-lock  3 \

videohubctrl.1

@@ -82,7 +82,7 @@ Set video input port X name.
 \fB\-\-vo\-name\fR <out_X> <name>
 Set video output port X name.
 .TP
-\fB\-\-vo\-route\fR <out_X> <in_Y>
+\fB\-\-vo\-input\fR <out_X> <in_Y>
 Connect video output X to video input Y.
 .TP
 \fB\-\-vo\-lock\fR <out_X>
@@ -139,8 +139,8 @@ To get a quick start here are some example command lines.
    videohubctrl --vo-unlock "Output 16"
 
  # Set two outputs to receive from the same input using port names
-   videohubctrl -h sdi --vo-route "Output 8" "Windows 4 HD"
-   videohubctrl -h sdi --vo-route "Output 7" "Windows 4 HD"
+   videohubctrl -h sdi --vo-input "Output 8" "Windows 4 HD"
+   videohubctrl -h sdi --vo-input "Output 7" "Windows 4 HD"
 
  # Run several commands at once
  # Rename video input 11 and 12
@@ -151,7 +151,7 @@ To get a quick start here are some example command lines.
                 --vi-name 11 "Test input" \\
                 --vi-name 12 "Playout input" \\
                 --vo-name 5 "Encoder h264" \\
-                --vo-route 5 12 \\
+                --vo-input 5 12 \\
                 --vo-lock 5
 .fi
 .SH SEE ALSO

videohubctrl.c

@@ -63,7 +63,8 @@ static const struct option long_options[] = {
 	{ "list-voutputs",		no_argument,       NULL, 903 },
 	{ "vi-name",			required_argument, NULL, 1001 },
 	{ "vo-name",			required_argument, NULL, 2001 },
-	{ "vo-route",			required_argument, NULL, 2002 },
+	{ "vo-input",			required_argument, NULL, 2002 },
+	{ "vo-route",			required_argument, NULL, 2002 }, // Alias of --vo-input
 	{ "vo-lock",			required_argument, NULL, 2003 },
 	{ "vo-unlock",			required_argument, NULL, 2004 },
 	{ 0, 0, 0, 0 }
@@ -90,17 +91,15 @@ static void show_help(struct videohub_data *data) {
 	printf(" --list-vinputs             | List device video inputs.\n");
 	printf(" --list-voutputs            | List device video outputs.\n");
 	printf("\n");
-	printf("Video input/output configuration:\n");
+	printf("Video inputs configuration:\n");
 	printf(" --vi-name <in_X> <name>    | Set video input port X name.\n");
+	printf("\n");
+	printf("Video outputs configuration:\n");
 	printf(" --vo-name <out_X> <name>   | Set video output port X name.\n");
-	printf("\n");
-	printf(" --vo-route <out_X> <in_Y>  | Connect video output X to video input Y\n");
-	printf("\n");
+	printf(" --vo-input <out_X> <in_Y>  | Connect video output X to video input Y\n");
 	printf(" --vo-lock <out_X>          | Lock output port X.\n");
 	printf(" --vo-unlock <out_X>        | Unlock output port X.\n");
 	printf("\n");
-	printf("   For <in_X/out_X/in_Y> you may use port number or port name.\n");
-	printf("\n");
 	printf("Misc options:\n");
 	printf(" -T --test-input <file>     | Read commands from <file>.\n");
 	printf(" -d --debug                 | Increase logging verbosity.\n");
@@ -194,7 +193,7 @@ static void parse_options(struct videohub_data *data, int argc, char **argv) {
 			case 903: show_list |= action_list_voutputs; break; // --list-voutputs
 			case 1001: parse_cmd2(argc, argv, CMD_INPUT_LABELS); break; // --vi-name
 			case 2001: parse_cmd2(argc, argv, CMD_OUTPUT_LABELS); break; // --vo-name
-			case 2002: parse_cmd2(argc, argv, CMD_VIDEO_OUTPUT_ROUTING); break; // --vo-route
+			case 2002: parse_cmd2(argc, argv, CMD_VIDEO_OUTPUT_ROUTING); break; // --vo-input
 			case 2003: parse_cmd1(argc, argv, CMD_VIDEO_OUTPUT_LOCKS, true); break; // --vo-lock
 			case 2004: parse_cmd1(argc, argv, CMD_VIDEO_OUTPUT_LOCKS, false); break; // --vo-unlock
 			case 'H': // --help