Merge pull request #559 from JLLeitschuh/fix/cameraSouceNotRunningPipeline

JLLeitschuh · JLLeitschuh · commit aa999d4917b4 · 2016-03-31T16:39:49.000-04:00
Fix CameraSource Not Running Pipeline
diff --git a/core/src/main/java/edu/wpi/grip/core/sources/CameraSource.java b/core/src/main/java/edu/wpi/grip/core/sources/CameraSource.java
@@ -249,7 +249,7 @@ protected boolean updateOutputSockets() {
             synchronized (currentFrameTransferMat) {
                 currentFrameTransferMat.copyTo(frameOutputSocket.getValue().get());
             }
-            // Don't call frameOutputSocket.setValue the value is already set.
+            frameOutputSocket.setValueOptional(frameOutputSocket.getValue());
 
             // Update the frame rate value
             frameRateOutputSocket.setValue(frameRate);

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ protected boolean updateOutputSockets() {`
`249`	`249`	`synchronized (currentFrameTransferMat) {`
`250`	`250`	`currentFrameTransferMat.copyTo(frameOutputSocket.getValue().get());`
`251`	`251`	`}`
`252`		`- // Don't call frameOutputSocket.setValue the value is already set.`
	`252`	`+ frameOutputSocket.setValueOptional(frameOutputSocket.getValue());`
`253`	`253`
`254`	`254`	`// Update the frame rate value`
`255`	`255`	`frameRateOutputSocket.setValue(frameRate);`