From c9dea2968decfd33df348a18cc854ae43faffc17 Mon Sep 17 00:00:00 2001 From: Dustin Spicuzza Date: Mon, 5 Dec 2022 16:30:13 -0500 Subject: [PATCH] [cscore] Emit warning that USB Camera isn't supported on OSX (#4766) Reduces user confusion, as right now there's really no indication that something is wrong other than there's no camera, --- cscore/src/main/native/osx/UsbCameraImpl.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cscore/src/main/native/osx/UsbCameraImpl.cpp b/cscore/src/main/native/osx/UsbCameraImpl.cpp index 3b5d82185c..48ddbd7456 100644 --- a/cscore/src/main/native/osx/UsbCameraImpl.cpp +++ b/cscore/src/main/native/osx/UsbCameraImpl.cpp @@ -2,6 +2,7 @@ // Open Source Software; you can modify and/or share it under the terms of // the WPILib BSD license file in the root directory of this project. +#include "Instance.h" #include "cscore_cpp.h" namespace cs { @@ -9,12 +10,16 @@ namespace cs { CS_Source CreateUsbCameraDev(std::string_view name, int dev, CS_Status* status) { *status = CS_INVALID_HANDLE; + WPI_ERROR(Instance::GetInstance().logger, + "USB Camera support not implemented for macOS"); return 0; } CS_Source CreateUsbCameraPath(std::string_view name, std::string_view path, CS_Status* status) { *status = CS_INVALID_HANDLE; + WPI_ERROR(Instance::GetInstance().logger, + "USB Camera support not implemented for macOS"); return 0; } @@ -35,6 +40,8 @@ UsbCameraInfo GetUsbCameraInfo(CS_Source source, CS_Status* status) { std::vector EnumerateUsbCameras(CS_Status* status) { *status = CS_INVALID_HANDLE; + WPI_ERROR(Instance::GetInstance().logger, + "USB Camera support not implemented for macOS"); return std::vector{}; }