Add support for exclusive and non-exclusive locks.

ChangeLog

@@ -1,7 +1,9 @@
 |-----------------------------------------------------------------------|
 xxxx-xx-xx : Version 0.2 - dev
  * Fix port routing. Previously it was reversed and incorrect.
+ * Fix command parsing of multiple commands comming in one packet.
  * Add -m / --monitor parameter for live configuration monitoring.
+ * Add support for reporting exclusive and non-exclusive locks.
 
 2014-11-26 : Version 0.1
  * Initial vesion with support for showing Videohub configuration

README

@@ -123,7 +123,7 @@ Serial ports: 0
 |  3 | L | Windows 1                   | Enc1 3                      |
 |  4 | L | Windows 1                   | Enc1 4                      |
 |  5 |   | Input 5                     | Output 5                    |
-|  6 |   | Input 6                     | Output 6                    |
+|  6 | + | Input 6                     | Output 6                    |
 |  7 |   | Input 7                     | Output 7                    |
 |  8 |   | Input 8                     | Output 8                    |
 |  9 | L | Windows 4 HD                | Enc2 1                      |
@@ -132,7 +132,7 @@ Serial ports: 0
 | 12 | L | DPlay2                      | Denc                        |
 | 13 | L | DPlay1                      | Output 13                   |
 | 14 |   | Input 14                    | Output 14                   |
-| 15 |   | Input 15                    | Output 15                   |
+| 15 | + | Input 15                    | Output 15                   |
 | 16 |   | Loopback                    | Loopback                    |
 ----------------------------------------------------------------------
 

cmd.c

@@ -83,9 +83,9 @@ VIDEO OUTPUT LOCKS:
 10 U
 11 L
 12 L
-13 U
+13 O
 14 U
-15 U
+15 O
 
 VIDEO OUTPUT ROUTING:
 0 2
@@ -254,8 +254,19 @@ bool parse_command(struct videohub_data *data, char *cmd) {
 			break;
 
 		case CMD_VIDEO_OUTPUT_LOCKS:
-			if (valid_slot)
-				data->outputs[slot_pos].locked = slot_data[0] == 'L' ? true : false;
+			if (valid_slot) {
+				// L is exclusive lock     - can be set only via USB
+				// O is non-exclusive lock - can be set via network
+				if (slot_data[0] == 'L' || slot_data[0] == 'O') {
+					data->outputs[slot_pos].locked = true;
+					if (slot_data[0] == 'L')
+						data->outputs[slot_pos].locked_exclusive = true;
+					else
+						data->outputs[slot_pos].locked_exclusive = false;
+				} else {
+					data->outputs[slot_pos].locked = false;
+				}
+			}
 			break;
 
 		case CMD_VIDEO_OUTPUT_ROUTING:

data.h

@@ -39,6 +39,7 @@ struct output_desc {
 	char			name[MAX_NAME_LEN];
 	unsigned int	routed_to;
 	bool			locked;
+	bool			locked_exclusive;
 };
 
 struct videohub_data {

videohubctrl.c

@@ -143,7 +143,7 @@ static void print_device_settings(struct videohub_data *d) {
 	for(i = 0; i < d->device.num_video_inputs; i++) {
 		printf("| %2d | %c | %-27s | %-27s |\n",
 			i + 1,
-			d->outputs[i].locked ? 'L' : ' ',
+			d->outputs[i].locked ? (d->outputs[i].locked_exclusive ? 'L' : '+') : ' ',
 			d->inputs[d->outputs[i].routed_to].name,
 			d->outputs[i].name
 		);