Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +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

15
src/cameraserver_c.cpp
View File

@@ -94,11 +94,6 @@ char** CS_GetEnumPropertyChoices(CS_Property property, int* count,
return out;
}
CS_Property CS_GetSourceProperty(CS_Source handle, const char* name,
CS_Status* status) {
return cs::GetSourceProperty(handle, name, status);
}
CS_Source CS_CreateUSBSourceDev(const char* name, int dev, CS_Status* status) {
return cs::CreateUSBSourceDev(name, dev, status);
}
@@ -144,6 +139,11 @@ CS_Bool CS_IsSourceConnected(CS_Source source, CS_Status* status) {
return cs::IsSourceConnected(source, status);
}
CS_Property CS_GetSourceProperty(CS_Source source, const char* name,
CS_Status* status) {
return cs::GetSourceProperty(source, name, status);
}
CS_Property* CS_EnumerateSourceProperties(CS_Source source, int* count,
CS_Status* status) {
llvm::SmallVector<CS_Property, 32> vec;
@@ -250,6 +250,11 @@ CS_Source CS_GetSinkSource(CS_Sink sink, CS_Status* status) {
return cs::GetSinkSource(sink, status);
}
CS_Property CS_GetSinkSourceProperty(CS_Sink sink, const char* name,
CS_Status* status) {
return cs::GetSinkSourceProperty(sink, name, status);
}
CS_Sink CS_CopySink(CS_Sink sink, CS_Status* status) {
return cs::CopySink(sink, status);
}

19
src/cameraserver_cpp.cpp
View File

@@ -81,15 +81,6 @@ std::vector<std::string> GetEnumPropertyChoices(CS_Property property,
return std::vector<std::string>{}; // TODO
}
//
// Source/Sink Functions
//
CS_Property GetSourceProperty(CS_Source handle, llvm::StringRef name,
CS_Status* status) {
return 0; // TODO
}
//
// Source Creation Functions
//
@@ -147,6 +138,11 @@ bool IsSourceConnected(CS_Source source, CS_Status* status) {
return false; // TODO
}
CS_Property GetSourceProperty(CS_Source source, llvm::StringRef name,
CS_Status* status) {
return 0; // TODO
}
void EnumerateSourceProperties(CS_Source source,
llvm::SmallVectorImpl<CS_Property>& properties,
CS_Status* status) {
@@ -256,6 +252,11 @@ CS_Source GetSinkSource(CS_Sink sink, CS_Status* status) {
return 0; // TODO
}
CS_Property GetSinkSourceProperty(CS_Sink sink, llvm::StringRef name,
CS_Status* status) {
return 0; // TODO
}
CS_Sink CopySink(CS_Sink sink, CS_Status* status) {
return sink; // TODO
}