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

Finish rename of EnumerateSinks to EnumerateSinkHandles.

Browse Source 
And similarly for EnumerateSources to EnumerateSourceHandles.
This commit is contained in:
Peter Johnson
2016-09-09 23:28:57 -07:00
parent 5c59b9aeb3
commit 52c8743b36
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/cameraserver_cpp.h
View File

@@ -182,9 +182,10 @@ void RemoveSinkListener(CS_Listener handle, CS_Status* status);
//
std::vector<USBCameraInfo> EnumerateUSBCameras(CS_Status* status);
void EnumerateSources(llvm::SmallVectorImpl<CS_Source>& handles,
CS_Status* status);
void EnumerateSinks(llvm::SmallVectorImpl<CS_Sink>& handles, CS_Status* status);
void EnumerateSourceHandles(llvm::SmallVectorImpl<CS_Source>& handles,
CS_Status* status);
void EnumerateSinkHandles(llvm::SmallVectorImpl<CS_Sink>& handles,
CS_Status* status);
} // namespace cs

4
java/lib/CameraServerJNI.cpp
View File

@@ -763,7 +763,7 @@ JNIEXPORT jintArray JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_enumerateS
{
CS_Status status;
llvm::SmallVector<CS_Source, 16> arr;
cs::EnumerateSources(arr, &status);
cs::EnumerateSourceHandles(arr, &status);
if (!CheckStatus(env, status)) return nullptr;
return MakeJIntArray(env, arr);
}
@@ -778,7 +778,7 @@ JNIEXPORT jintArray JNICALL Java_edu_wpi_cameraserver_CameraServerJNI_enumerateS
{
CS_Status status;
llvm::SmallVector<CS_Sink, 16> arr;
cs::EnumerateSinks(arr, &status);
cs::EnumerateSinkHandles(arr, &status);
if (!CheckStatus(env, status)) return nullptr;
return MakeJIntArray(env, arr);
}

4
src/cameraserver_c.cpp
View File

@@ -350,7 +350,7 @@ void CS_FreeEnumeratedUSBCameras(CS_USBCameraInfo* cameras, int count) {
CS_Source* CS_EnumerateSources(int* count, CS_Status* status) {
llvm::SmallVector<CS_Source, 32> handles;
cs::EnumerateSources(handles, status);
cs::EnumerateSourceHandles(handles, status);
CS_Source* sources =
static_cast<CS_Source*>(std::malloc(handles.size() * sizeof(CS_Source)));
*count = handles.size();
@@ -369,7 +369,7 @@ void CS_ReleaseEnumeratedSources(CS_Source* sources, int count) {
CS_Sink* CS_EnumerateSinks(int* count, CS_Status* status) {
llvm::SmallVector<CS_Sink, 32> handles;
cs::EnumerateSinks(handles, status);
cs::EnumerateSinkHandles(handles, status);
CS_Sink* sinks =
static_cast<CS_Sink*>(std::malloc(handles.size() * sizeof(CS_Sink)));
*count = handles.size();

4
src/cameraserver_oo.cpp
View File

@@ -24,7 +24,7 @@ std::vector<VideoSource> VideoSource::EnumerateSources() {
std::vector<VideoSource> sources;
llvm::SmallVector<CS_Source, 16> handles;
CS_Status status = 0;
::cs::EnumerateSources(handles, &status);
::cs::EnumerateSourceHandles(handles, &status);
sources.reserve(handles.size());
for (int handle : handles)
sources.emplace_back(VideoSource{handle});
@@ -35,7 +35,7 @@ std::vector<VideoSink> VideoSink::EnumerateSinks() {
std::vector<VideoSink> sinks;
llvm::SmallVector<CS_Sink, 16> handles;
CS_Status status = 0;
::cs::EnumerateSinks(handles, &status);
::cs::EnumerateSinkHandles(handles, &status);
sinks.reserve(handles.size());
for (int handle : handles)
sinks.emplace_back(VideoSink{handle});