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

Improve listener interface.

Browse Source 
Now a structure is passed back, enabling combining the existing source
and sink listeners and adding property listeners as well.
This commit is contained in:
Peter Johnson
2016-11-04 12:46:22 -07:00
parent e07a40a16d
commit 8d2efb2838
8 changed files with 165 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/lib/CameraServerJNI.cpp
View File

@@ -800,27 +800,14 @@ JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_setSinkEnabled
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: removeSourceListener
* Method: removeListener
* Signature: (I)V
*/
JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_removeSourceListener
JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_removeListener
(JNIEnv *env, jclass, jint handle)
{
CS_Status status = 0;
cs::RemoveSourceListener(handle, &status);
CheckStatus(env, status);
}
/*
* Class: edu_wpi_cameraserver_CameraServerJNI
* Method: removeSinkListener
* Signature: (I)V
*/
JNIEXPORT void JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_removeSinkListener
(JNIEnv *env, jclass, jint handle)
{
CS_Status status = 0;
cs::RemoveSinkListener(handle, &status);
cs::RemoveListener(handle, &status);
CheckStatus(env, status);
}

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

@@ -156,16 +156,10 @@ public class CameraServerJNI {
//
// Listener Functions
//
//public static native int addSourceListener(void (*callback)(String name, int source,
// int event),
//public static native int addListener(void (*callback)(VideoEvent event),
// int eventMask);
public static native void removeSourceListener(int handle);
//public static native int addSinkListener(void (*callback)(String name, int sink, int event),
// int eventMask);
public static native void removeSinkListener(int handle);
public static native void removeListener(int handle);
//
// Utility Functions