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

USBCamera, HTTPCamera: Name functions consistent with classes.

Browse Source
This commit is contained in:
Peter Johnson
2016-10-15 23:07:28 -07:00
parent 70531762b9
commit 9caa0af4d9
10 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/cameraserver_c.h
View File

@@ -104,10 +104,10 @@ char** CS_GetEnumPropertyChoices(CS_Property property, int* count,
//
// Source Creation Functions
//
CS_Source CS_CreateUSBSourceDev(const char* name, int dev, CS_Status* status);
CS_Source CS_CreateUSBSourcePath(const char* name, const char* path,
CS_Source CS_CreateUSBCameraDev(const char* name, int dev, CS_Status* status);
CS_Source CS_CreateUSBCameraPath(const char* name, const char* path,
CS_Status* status);
CS_Source CS_CreateHTTPSource(const char* name, const char* url,
CS_Source CS_CreateHTTPCamera(const char* name, const char* url,
CS_Status* status);
CS_Source CS_CreateCvSource(const char* name, const CS_VideoMode* mode,
CS_Status* status);

6
include/cameraserver_cpp.h
View File

@@ -92,10 +92,10 @@ std::vector<std::string> GetEnumPropertyChoices(CS_Property property,
//
// Source Creation Functions
//
CS_Source CreateUSBSourceDev(llvm::StringRef name, int dev, CS_Status* status);
CS_Source CreateUSBSourcePath(llvm::StringRef name, llvm::StringRef path,
CS_Source CreateUSBCameraDev(llvm::StringRef name, int dev, CS_Status* status);
CS_Source CreateUSBCameraPath(llvm::StringRef name, llvm::StringRef path,
CS_Status* status);
CS_Source CreateHTTPSource(llvm::StringRef name, llvm::StringRef url,
CS_Source CreateHTTPCamera(llvm::StringRef name, llvm::StringRef url,
CS_Status* status);
CS_Source CreateCvSource(llvm::StringRef name, const VideoMode& mode,
CS_Status* status);

6
include/cameraserver_oo.inl
View File

@@ -156,11 +156,11 @@ inline std::vector<VideoMode> VideoSource::EnumerateVideoModes() const {
}
inline USBCamera::USBCamera(llvm::StringRef name, int dev) {
m_handle = CreateUSBSourceDev(name, dev, &m_status);
m_handle = CreateUSBCameraDev(name, dev, &m_status);
}
inline USBCamera::USBCamera(llvm::StringRef name, llvm::StringRef path) {
m_handle = CreateUSBSourcePath(name, path, &m_status);
m_handle = CreateUSBCameraPath(name, path, &m_status);
}
inline std::vector<USBCameraInfo> USBCamera::EnumerateUSBCameras() {
@@ -169,7 +169,7 @@ inline std::vector<USBCameraInfo> USBCamera::EnumerateUSBCameras() {
}
inline HTTPCamera::HTTPCamera(llvm::StringRef name, llvm::StringRef url) {
m_handle = CreateHTTPSource(name, url, &m_status);
m_handle = CreateHTTPCamera(name, url, &m_status);
}
inline CvSource::CvSource(llvm::StringRef name, const VideoMode& mode) {