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

[ci] Upgrade to new macOS runner (#6328)

Browse Source
This commit is contained in:
Tyler Veness
2024-02-04 10:38:23 -08:00
committed by GitHub
parent d4533a8900
commit 3b2a2381b6
7 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cscore/src/main/native/objcpp/UsbCameraImpl.mm
View File

@@ -135,7 +135,11 @@ std::vector<UsbCameraInfo> EnumerateUsbCameras(CS_Status* status) {
std::vector<UsbCameraInfo> retval;
NSArray<AVCaptureDeviceType>* deviceTypes = @[
AVCaptureDeviceTypeBuiltInWideAngleCamera,
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 140000
AVCaptureDeviceTypeExternal
#else
AVCaptureDeviceTypeExternalUnknown
#endif
];
AVCaptureDeviceDiscoverySession* session = [AVCaptureDeviceDiscoverySession
discoverySessionWithDeviceTypes:deviceTypes

4
cscore/src/main/native/objcpp/UsbCameraListener.mm
View File

@@ -76,7 +76,11 @@ using namespace cs;
if ([device.deviceType
isEqualToString:AVCaptureDeviceTypeBuiltInWideAngleCamera] ||
[device.deviceType
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 140000
isEqualToString:AVCaptureDeviceTypeExternal]) {
#else
isEqualToString:AVCaptureDeviceTypeExternalUnknown]) {
#endif
self.notifier->NotifyUsbCamerasChanged();
}
});