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

Rename Type to Kind.

Browse Source
This commit is contained in:
Peter Johnson
2016-11-15 23:54:50 -08:00
parent 3c7d8063f6
commit 791cabbc26
25 changed files with 265 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cscore_cpp.cpp
View File

@@ -40,11 +40,11 @@ namespace cs {
// Property Functions
//
CS_PropertyType GetPropertyType(CS_Property property, CS_Status* status) {
CS_PropertyKind GetPropertyKind(CS_Property property, CS_Status* status) {
int propertyIndex;
auto source = GetPropertySource(property, &propertyIndex, status);
if (!source) return CS_PROP_NONE;
return source->GetPropertyType(propertyIndex);
return source->GetPropertyKind(propertyIndex);
}
std::string GetPropertyName(CS_Property property, CS_Status* status) {
@@ -152,13 +152,13 @@ CS_Source CreateHTTPCamera(llvm::StringRef name, llvm::StringRef url,
// Source Functions
//
CS_SourceType GetSourceType(CS_Source source, CS_Status* status) {
CS_SourceKind GetSourceKind(CS_Source source, CS_Status* status) {
auto data = Sources::GetInstance().Get(source);
if (!data) {
*status = CS_INVALID_HANDLE;
return CS_SOURCE_UNKNOWN;
}
return data->type;
return data->kind;
}
std::string GetSourceName(CS_Source source, CS_Status* status) {
@@ -348,13 +348,13 @@ void ReleaseSource(CS_Source source, CS_Status* status) {
// Sink Functions
//
CS_SinkType GetSinkType(CS_Sink sink, CS_Status* status) {
CS_SinkKind GetSinkKind(CS_Sink sink, CS_Status* status) {
auto data = Sinks::GetInstance().Get(sink);
if (!data) {
*status = CS_INVALID_HANDLE;
return CS_SINK_UNKNOWN;
}
return data->type;
return data->kind;
}
std::string GetSinkName(CS_Sink sink, CS_Status* status) {