gfto
/
videohubctrl
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 8 Wiki Activity
Browse Source

Initialize all routes to NO_PORT by default.

Georgi Chorbadzhiyski 9 years ago
parent
d6f8eeeebe
commit
57dde60884
3 changed files with 22 additions and 38 deletions
Split View Show Diff Stats
  1. 3
    5
      test/test-14.ok
  2. 17
    33
      test/test-17.ok
  3. 2
    0
      videohubctrl.c

+ 3
- 5
test/test-14.ok View File 

@@ -39,10 +39,8 @@ Video inputs
39 39 
   ----------------------------------------------------------------------
40 40 
   | ### | Video input name         | nn | Routed to output         | s |
41 41 
   ----------------------------------------------------------------------
42 
-  |   1 | Windows 1                |  4 | Enc1 3                   |   |
42 
+  |   1 | Windows 1                |  2 | Enc1 3                   |   |
43 43 
   |     |                          |    | Enc1 4                   |   |
44 
-  |     |                          |    | Output 7                 |   |
45 
-  |     |                          |    | Output 10                |   |
46 44 
   |   2 | Windows 2                |  1 | Enc1 2                   |   |
47 45 
   |   3 | Windows 3                |  1 | Enc1 1                   |   |
48 46 
   |   4 | Windows 4 HD             |  2 |                          |   |
 
@@ -71,10 +69,10 @@ Video outputs
71 69 
   |   4 | L | Enc1 4                   | Windows 1                | T |
72 70 
   |   5 |   | Output 5                 | Input 5                  |   |
73 71 
   |   6 |   | Output 6                 | Input 6                  |   |
74 
-  |   7 |   | Output 7                 | Windows 1                |   |
72 
+  |   7 |   | Output 7                 |                          |   |
75 73 
   |   8 |   |                          | Windows 4 HD             |   |
76 74 
   |   9 | L | Enc2 1                   | Windows 4 HD             |   |
77 
-  |  10 |   | Output 10                | Windows 1                |   |
75 
+  |  10 |   | Output 10                |                          |   |
78 76 
   |  11 |   | Output 11                | Input 11                 |   |
79 77 
   |  12 | L | Denc                     | DPlay2                   |   |
80 78 
   |  13 | O | Output 13                | DPlay1                   |   |

+ 17
- 33
test/test-17.ok View File 

@@ -63,24 +63,8 @@ Video inputs
63 63 
   ----------------------------------------------------------------------
64 64 
   | ### | Video input name         | nn | Routed to output         | s |
65 65 
   ----------------------------------------------------------------------
66 
-  |   1 | Windows 1                | 18 | Enc1 3                   | B |
66 
+  |   1 | Windows 1                |  2 | Enc1 3                   | B |
67 67 
   |     |                          |    | Enc1 4                   |   |
68 
-  |     |                          |    |                          |   |
69 
-  |     |                          |    |                          |   |
70 
-  |     |                          |    |                          |   |
71 
-  |     |                          |    |                          |   |
72 
-  |     |                          |    |                          |   |
73 
-  |     |                          |    |                          |   |
74 
-  |     |                          |    |                          |   |
75 
-  |     |                          |    |                          |   |
76 
-  |     |                          |    |                          |   |
77 
-  |     |                          |    |                          |   |
78 
-  |     |                          |    |                          |   |
79 
-  |     |                          |    |                          |   |
80 
-  |     |                          |    |                          |   |
81 
-  |     |                          |    |                          |   |
82 
-  |     |                          |    |                          |   |
83 
-  |     |                          |    |                          |   |
84 68 
   |   2 | Windows 2                |  1 | Enc1 2                   | B |
85 69 
   |   3 | Windows 3                |  1 | Enc1 1                   | B |
86 70 
   |   4 | Windows 4 HD             |  2 | Output 8                 | B |
 
@@ -119,22 +103,22 @@ Video outputs
119 103 
   |  14 |   | Output 14                | Input 14                 | o |
120 104 
   |  15 |   | Output 15                | Input 15                 | o |
121 105 
   |  16 | O | Loopback                 | Loopback                 | o |
122 
-  |  17 |   |                          | Windows 1                |   |
123 
-  |  18 |   |                          | Windows 1                |   |
124 
-  |  19 |   |                          | Windows 1                |   |
125 
-  |  20 |   |                          | Windows 1                |   |
126 
-  |  21 |   |                          | Windows 1                |   |
127 
-  |  22 |   |                          | Windows 1                |   |
128 
-  |  23 |   |                          | Windows 1                |   |
129 
-  |  24 |   |                          | Windows 1                |   |
130 
-  |  25 |   |                          | Windows 1                |   |
131 
-  |  26 |   |                          | Windows 1                |   |
132 
-  |  27 |   |                          | Windows 1                |   |
133 
-  |  28 |   |                          | Windows 1                |   |
134 
-  |  29 |   |                          | Windows 1                |   |
135 
-  |  30 |   |                          | Windows 1                |   |
136 
-  |  31 |   |                          | Windows 1                |   |
137 
-  |  32 |   |                          | Windows 1                |   |
106 
+  |  17 |   |                          |                          |   |
107 
+  |  18 |   |                          |                          |   |
108 
+  |  19 |   |                          |                          |   |
109 
+  |  20 |   |                          |                          |   |
110 
+  |  21 |   |                          |                          |   |
111 
+  |  22 |   |                          |                          |   |
112 
+  |  23 |   |                          |                          |   |
113 
+  |  24 |   |                          |                          |   |
114 
+  |  25 |   |                          |                          |   |
115 
+  |  26 |   |                          |                          |   |
116 
+  |  27 |   |                          |                          |   |
117 
+  |  28 |   |                          |                          |   |
118 
+  |  29 |   |                          |                          |   |
119 
+  |  30 |   |                          |                          |   |
120 
+  |  31 |   |                          |                          |   |
121 
+  |  32 |   |                          |                          |   |
138 122 
   ---------------------------------------------------------------------
139 123
140 124 
 Monitoring outputs

+ 2
- 0
videohubctrl.c View File 

@@ -378,6 +378,8 @@ int main(int argc, char **argv) {
378 378 
 			exit(EXIT_FAILURE);
379 379 
 	}
380 380
381 
+	reset_routed_to(&data->inputs);
382 
+	reset_routed_to(&data->outputs);
381 383 
 	reset_routed_to(&data->serial);
382 384 
 	reset_routed_to(&data->proc_units);
383 385 
 	reset_routed_to(&data->frames);

Write Preview
Loading…
Cancel
Save