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

Add methods to get property name and enumerate properties.

Browse Source 
Also add method to remove property by handle.
This commit is contained in:
Peter Johnson
2016-08-26 08:19:28 -07:00
parent 0158fd35f0
commit 0fbb2e8a14
10 changed files with 118 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/edu/wpi/cameraserver/CameraServerJNI.java
View File

@@ -69,6 +69,7 @@ public class CameraServerJNI {
// Property Functions
//
public static native int getPropertyType(int property);
public static native String getPropertyName(int property);
public static native boolean getBooleanProperty(int property);
public static native void setBooleanProperty(int property, boolean value);
public static native double getDoubleProperty(int property);
@@ -102,6 +103,7 @@ public class CameraServerJNI {
public static native long getSourceLastFrameTime(int source);
public static native int getSourceNumChannels(int source);
public static native boolean isSourceConnected(int source);
public static native int[] enumerateSourceProperties(int source);
public static native int copySource(int source);
public static native void releaseSource(int source);
@@ -118,7 +120,8 @@ public class CameraServerJNI {
// int type,
// void (*onChange)(String name,
// int property));
public static native void removeSourceProperty(int source, String name);
public static native void removeSourceProperty(int source, int property);
public static native void removeSourcePropertyByName(int source, String name);
//
// Sink Creation Functions

8
java/src/edu/wpi/cameraserver/CvSource.java
View File

@@ -60,9 +60,15 @@ public class CvSource extends VideoSource {
// std::function<void(String name, VideoProperty property)>
// onChange);
/// Remove a property.
/// @param name Property name
//public void removeProperty(VdeoProperty property) {
// CameraServerJNI.removeSourceProperty(m_handle, property.m_handle);
//}
/// Remove a property.
/// @param name Property name
public void removeProperty(String name) {
CameraServerJNI.removeSourceProperty(m_handle, name);
CameraServerJNI.removeSourcePropertyByName(m_handle, name);
}
}

3
java/src/edu/wpi/cameraserver/VideoSource.java
View File

@@ -51,6 +51,9 @@ public class VideoSource {
/// the given name exists)
//public VideoProperty getProperty(String name);
/// Enumerate all properties of this source.
//public VideoProperty[] enumerateProperties();
/// Enumerate all existing sources.
/// @return Vector of sources.
public static VideoSource[] enumerateSources() {