Fix merge conflicts

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / CameraFeeds.java

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index 4ea9b161f51bf82c0339c07e32d50336f6bee632..d1b0ac0970a5820ac91476a5d3d34c01811186a1 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -26,18 +26,20 @@ public class CameraFeeds {
     axisCamName = climberCam.getName();
     curCam = climberCam;
     changeCam(curCam);
+    System.out.println("Leaving CameraFeeds constructor");
   }
 
   public static CameraFeeds getCameraFeeds() {
+    System.out.println("Enter CameraFeeds.getCameraFeeds");
     if (cameraFeeds == null) {
       cameraFeeds = new CameraFeeds();
     }
+    System.out.println("Leaving CameraFeeds.getCameraFeeds");
     return cameraFeeds;
-
   }
 
   public void init() {
-    // changeCam(climberCam);
+    System.out.println("Initializing...");
   }
 
   public void toggleCamera() {
@@ -62,7 +64,7 @@ public class CameraFeeds {
    * newId for camera
    */
   public void changeCam(VideoSource cam) {
-    server.removeCamera(curCam.getName());
-    server.addCamera(cam);
+    System.out.println("Changing cameras...");
+    server.getVideo(cam);
   }
 }