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

VideoSource, VideoSink: Provide equality operation.

Browse Source 
* Provide hashCode implementation for Java.

* Provide getHandle for both C++ and Java.
This commit is contained in:
Peter Johnson
2016-11-13 21:41:25 -08:00
parent 797d049f31
commit 6c19eb59b2
3 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/cscore_oo.h
View File

@@ -91,6 +91,14 @@ class VideoSource {
explicit operator bool() const { return m_handle != 0; }
int GetHandle() const { return m_handle; }
bool operator==(const VideoSource& other) const {
return m_handle == other.m_handle;
}
bool operator!=(const VideoSource& other) const { return !(*this == other); }
/// Get the name of the source. The name is an arbitrary identifier
/// provided when the source is created, and should be unique.
std::string GetName() const;
@@ -262,6 +270,14 @@ class VideoSink {
explicit operator bool() const { return m_handle != 0; }
int GetHandle() const { return m_handle; }
bool operator==(const VideoSink& other) const {
return m_handle == other.m_handle;
}
bool operator!=(const VideoSink& other) const { return !(*this == other); }
/// Get the name of the sink. The name is an arbitrary identifier
/// provided when the sink is created, and should be unique.
std::string GetName() const;

16
java/src/edu/wpi/cscore/VideoSink.java
View File

@@ -26,6 +26,22 @@ public class VideoSink {
return m_handle != 0;
}
public int getHandle() {
return m_handle;
}
public boolean equals(Object other) {
if (this == other) return true;
if (other == null) return false;
if (getClass() != other.getClass()) return false;
VideoSink sink = (VideoSink) other;
return m_handle == sink.m_handle;
}
public int hashCode() {
return m_handle;
}
/// Get the name of the sink. The name is an arbitrary identifier
/// provided when the sink is created, and should be unique.
public String getName() {

16
java/src/edu/wpi/cscore/VideoSource.java
View File

@@ -26,6 +26,22 @@ public class VideoSource {
return m_handle != 0;
}
public int getHandle() {
return m_handle;
}
public boolean equals(Object other) {
if (this == other) return true;
if (other == null) return false;
if (getClass() != other.getClass()) return false;
VideoSource source = (VideoSource) other;
return m_handle == source.m_handle;
}
public int hashCode() {
return m_handle;
}
/// Get the name of the source. The name is an arbitrary identifier
/// provided when the source is created, and should be unique.
public String getName() {