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

Clean up odd special case of GetSourceProperty().

Browse Source
This commit is contained in:
Peter Johnson
2016-08-26 09:24:18 -07:00
parent 6bcc0e2d82
commit ec080118f4
7 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,11 +89,6 @@ public class CameraServerJNI {
public static native void setEnumProperty(int property, int value);
public static native String[] getEnumPropertyChoices(int property);
//
// Source/Sink Functions
//
public static native int getSourceProperty(int handle, String name);
//
// Source Creation Functions
//
@@ -110,6 +105,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 getSourceProperty(int source, String name);
public static native int[] enumerateSourceProperties(int source);
public static native int copySource(int source);
public static native void releaseSource(int source);
@@ -144,6 +140,7 @@ public class CameraServerJNI {
public static native String getSinkName(int sink);
public static native String getSinkDescription(int sink);
public static native void setSinkSource(int sink, int source);
public static native int getSinkSourceProperty(int sink, String name);
public static native int getSinkSource(int sink);
public static native int copySink(int sink);
public static native void releaseSink(int sink);

4
java/src/edu/wpi/cameraserver/VideoSink.java
View File

@@ -58,7 +58,9 @@ public class VideoSink {
/// @return Property (type Property::kNone if no property with
/// the given name exists or no source connected)
public VideoProperty getSourceProperty(String name) {
return new VideoProperty(CameraServerJNI.getSourceProperty(m_handle, name)); }
return new VideoProperty(
CameraServerJNI.getSinkSourceProperty(m_handle, name));
}
/// Enumerate all existing sinks.
/// @return Vector of sinks.