Skip to content

Commit 27f79b9

Browse files
committed
remove the macOS 12.0 min target from this file
* now redundant since project has deployment target set to 12.0
1 parent 48aa327 commit 27f79b9

1 file changed

Lines changed: 22 additions & 24 deletions

File tree

obs-studio-server/source/nodeobs_settings-osx.mm

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,31 @@
99
std::vector<std::pair<std::string, std::string>> result;
1010

1111
@autoreleasepool {
12-
if (@available(macOS 12.0, *)) {
13-
NSArray *deviceTypes;
14-
if (@available(macOS 13, *)) {
15-
deviceTypes = @[AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeExternalUnknown, AVCaptureDeviceTypeDeskViewCamera];
16-
} else {
17-
deviceTypes = @[AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeExternalUnknown];
18-
}
12+
NSArray *deviceTypes;
13+
if (@available(macOS 13, *)) {
14+
deviceTypes = @[AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeExternalUnknown, AVCaptureDeviceTypeDeskViewCamera];
15+
} else {
16+
deviceTypes = @[AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeExternalUnknown];
17+
}
1918

20-
AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:deviceTypes
21-
mediaType:AVMediaTypeVideo
22-
position:AVCaptureDevicePositionUnspecified];
19+
AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:deviceTypes
20+
mediaType:AVMediaTypeVideo
21+
position:AVCaptureDevicePositionUnspecified];
2322

24-
for (AVCaptureDevice *device in session.devices) {
25-
if (!device.localizedName || !device.uniqueID)
26-
continue;
27-
result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]});
28-
}
23+
for (AVCaptureDevice *device in session.devices) {
24+
if (!device.localizedName || !device.uniqueID)
25+
continue;
26+
result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]});
27+
}
2928

30-
AVCaptureDeviceDiscoverySession *muxedDiscoverySession = [AVCaptureDeviceDiscoverySession
31-
discoverySessionWithDeviceTypes:deviceTypes
32-
mediaType:AVMediaTypeMuxed
33-
position:AVCaptureDevicePositionUnspecified];
34-
for (AVCaptureDevice *device in muxedDiscoverySession.devices) {
35-
if (!device.localizedName || !device.uniqueID)
36-
continue;
37-
result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]});
38-
}
29+
AVCaptureDeviceDiscoverySession *muxedDiscoverySession = [AVCaptureDeviceDiscoverySession
30+
discoverySessionWithDeviceTypes:deviceTypes
31+
mediaType:AVMediaTypeMuxed
32+
position:AVCaptureDevicePositionUnspecified];
33+
for (AVCaptureDevice *device in muxedDiscoverySession.devices) {
34+
if (!device.localizedName || !device.uniqueID)
35+
continue;
36+
result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]});
3937
}
4038
}
4139

0 commit comments

Comments
 (0)