Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create VideoCamera base class and move camera settings functions to it.

Browse Source 
This makes them available for both UsbCamera and HttpCamera / AxisCamera.

To avoid virtual functions in the public-facing interface, move the
implementation of the camera settings functions to the core library.
This commit is contained in:
Peter Johnson
2017-01-01 14:24:13 -08:00
parent 23135d7a5a
commit 7ddbf20108
19 changed files with 581 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/edu/wpi/cscore/AxisCamera.java
View File

@@ -25,13 +25,13 @@ public class AxisCamera extends HttpCamera {
/// @param name Source name (arbitrary unique identifier)
/// @param host Camera host IP or DNS name (e.g. "10.x.y.11")
public AxisCamera(String name, String host) {
super(name, hostToUrl(host), CameraKind.kAxis);
super(name, hostToUrl(host), HttpCameraKind.kAxis);
}
/// Create a source for an Axis IP camera.
/// @param name Source name (arbitrary unique identifier)
/// @param hosts Array of Camera host IPs/DNS names
public AxisCamera(String name, String[] hosts) {
super(name, hostToUrl(hosts), CameraKind.kAxis);
super(name, hostToUrl(hosts), HttpCameraKind.kAxis);
}
}