Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cscore] Deprecate AxisCamera (#6579)

Browse Source
This commit is contained in:
Gold856
2024-05-12 13:28:51 -04:00
committed by GitHub
parent fb3e0e1ecb
commit 305a0657e2
12 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cscore/src/main/native/include/cscore_oo.h
View File

@@ -692,8 +692,10 @@ class HttpCamera : public VideoCamera {
/**
* A source that represents an Axis IP camera.
*
* @deprecated Use HttpCamera instead.
*/
class AxisCamera : public HttpCamera {
class [[deprecated("Use HttpCamera instead.")]] AxisCamera : public HttpCamera {
static std::string HostToUrl(std::string_view host);
static std::vector<std::string> HostToUrl(std::span<const std::string> hosts);
template <typename T>

5
cscore/src/main/native/include/cscore_oo.inc
View File

@@ -11,6 +11,8 @@
#include <utility>
#include <vector>
#include <wpi/deprecated.h>
#include "cscore_oo.h"
namespace cs {
@@ -350,7 +352,7 @@ inline std::vector<std::string> HttpCamera::GetUrls() const {
m_status = 0;
return ::cs::GetHttpCameraUrls(m_handle, &m_status);
}
WPI_IGNORE_DEPRECATED
inline std::vector<std::string> AxisCamera::HostToUrl(
std::span<const std::string> hosts) {
std::vector<std::string> rv;
@@ -389,6 +391,7 @@ template <typename T>
inline AxisCamera::AxisCamera(std::string_view name,
std::initializer_list<T> hosts)
: HttpCamera(name, HostToUrl(hosts), kAxis) {}
WPI_UNIGNORE_DEPRECATED
inline void ImageSource::NotifyError(std::string_view msg) {
m_status = 0;