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

10
include/cameraserver_c.h
View File

@@ -69,12 +69,6 @@ void CS_SetEnumProperty(CS_Property property, int value, CS_Status* status);
char** CS_GetEnumPropertyChoices(CS_Property property, int* count,
CS_Status* status);
//
// Source/Sink Functions
//
CS_Property CS_GetSourceProperty(CS_Source handle, const char* name,
CS_Status* status);
//
// Source Creation Functions
//
@@ -94,6 +88,8 @@ char* CS_GetSourceDescription(CS_Source source, CS_Status* status);
uint64_t CS_GetSourceLastFrameTime(CS_Source source, CS_Status* status);
int CS_GetSourceNumChannels(CS_Source source, CS_Status* status);
CS_Bool CS_IsSourceConnected(CS_Source source, CS_Status* status);
CS_Property CS_GetSourceProperty(CS_Source source, const char* name,
CS_Status* status);
CS_Property* CS_EnumerateSourceProperties(CS_Source source, int* count,
CS_Status* status);
CS_Source CS_CopySource(CS_Source source, CS_Status* status);
@@ -137,6 +133,8 @@ CS_Sink CS_CreateCvSinkCallback(const char* name, void* data,
char* CS_GetSinkName(CS_Sink sink, CS_Status* status);
char* CS_GetSinkDescription(CS_Sink sink, CS_Status* status);
void CS_SetSinkSource(CS_Sink sink, CS_Source source, CS_Status* status);
CS_Property CS_GetSinkSourceProperty(CS_Sink sink, const char* name,
CS_Status* status);
CS_Source CS_GetSinkSource(CS_Sink sink, CS_Status* status);
CS_Sink CS_CopySink(CS_Sink sink, CS_Status* status);
void CS_ReleaseSink(CS_Sink sink, CS_Status* status);

10
include/cameraserver_cpp.h
View File

@@ -68,12 +68,6 @@ void SetEnumProperty(CS_Property property, int value, CS_Status* status);
std::vector<std::string> GetEnumPropertyChoices(CS_Property property,
CS_Status* status);
//
// Source/Sink Functions
//
CS_Property GetSourceProperty(CS_Source handle, llvm::StringRef name,
CS_Status* status);
//
// Source Creation Functions
//
@@ -97,6 +91,8 @@ void GetSourceDescription(CS_Source source, llvm::SmallVectorImpl<char>& desc,
uint64_t GetSourceLastFrameTime(CS_Source source, CS_Status* status);
int GetSourceNumChannels(CS_Source source, CS_Status* status);
bool IsSourceConnected(CS_Source source, CS_Status* status);
CS_Property GetSourceProperty(CS_Source source, llvm::StringRef name,
CS_Status* status);
void EnumerateSourceProperties(CS_Source source,
llvm::SmallVectorImpl<CS_Property>& properties,
CS_Status* status);
@@ -143,6 +139,8 @@ std::string GetSinkDescription(CS_Sink sink, CS_Status* status);
void GetSinkDescription(CS_Sink sink, llvm::SmallVectorImpl<char>& desc,
CS_Status* status);
void SetSinkSource(CS_Sink sink, CS_Source source, CS_Status* status);
CS_Property GetSinkSourceProperty(CS_Sink sink, llvm::StringRef name,
CS_Status* status);
CS_Source GetSinkSource(CS_Sink sink, CS_Status* status);
CS_Sink CopySink(CS_Sink sink, CS_Status* status);
void ReleaseSink(CS_Sink sink, CS_Status* status);

2
include/cameraserver_oo.inl
View File

@@ -256,7 +256,7 @@ inline VideoSource VideoSink::GetSource() const {
inline VideoProperty VideoSink::GetSourceProperty(llvm::StringRef name) {
m_status = 0;
return VideoProperty{::cs::GetSourceProperty(m_handle, name, &m_status)};
return VideoProperty{GetSinkSourceProperty(m_handle, name, &m_status)};
}
inline HTTPSink::HTTPSink(llvm::StringRef name, llvm::StringRef listenAddress,