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

Remove RemoveSourceProperty.

Browse Source
This commit is contained in:
Peter Johnson
2016-10-24 22:29:58 -07:00
parent 511d551546
commit 7ca6c5ef34
8 changed files with 0 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
java/lib/CameraServerJNI.cpp
View File

@@ -615,32 +615,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_setSourceEnumPr
CheckStatus(env, status);
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: removeSourceProperty
* Signature: (II)V
*/
JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_removeSourceProperty
(JNIEnv *env, jclass, jint source, jint property)
{
CS_Status status = 0;
cs::RemoveSourceProperty(source, property, &status);
CheckStatus(env, status);
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: removeSourcePropertyByName
* Signature: (ILjava/lang/String;)V
*/
JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_removeSourcePropertyByName
(JNIEnv *env, jclass, jint source, jstring name)
{
CS_Status status = 0;
cs::RemoveSourceProperty(source, JStringRef{env, name}, &status);
CheckStatus(env, status);
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: createMJPEGServer

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

@@ -125,8 +125,6 @@ public class CameraServerJNI {
// int type, int minimum, int maximum, int step, int defaultValue, int value,
// void (*onChange)(int property));
public static native void setSourceEnumPropertyChoices(int source, int property, String[] choices);
public static native void removeSourceProperty(int source, int property);
public static native void removeSourcePropertyByName(int source, String name);
//
// Sink Creation Functions

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

@@ -87,16 +87,4 @@ public class CvSource extends VideoSource {
public void SetEnumPropertyChoices(VideoProperty property, String[] choices) {
CameraServerJNI.setSourceEnumPropertyChoices(m_handle, property.m_handle, choices);
}
/// Remove a property.
/// @param name Property name
public void removeProperty(VideoProperty property) {
CameraServerJNI.removeSourceProperty(m_handle, property.m_handle);
}
/// Remove a property.
/// @param name Property name
public void removeProperty(String name) {
CameraServerJNI.removeSourcePropertyByName(m_handle, name);
}
}