Skip to content

Commit a7bbca2

Browse files
committed
run clang-format
1 parent 12508dc commit a7bbca2

2 files changed

Lines changed: 9 additions & 11 deletions

File tree

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
std::vector<std::pair<std::string, std::string>> result;
88

99
if (@available(macOS 12.0, *)) {
10-
NSMutableArray<AVCaptureDeviceType> *deviceTypes =
11-
[NSMutableArray arrayWithObject:AVCaptureDeviceTypeBuiltInWideAngleCamera];
10+
NSMutableArray<AVCaptureDeviceType> *deviceTypes = [NSMutableArray arrayWithObject:AVCaptureDeviceTypeBuiltInWideAngleCamera];
1211

1312
if (@available(macOS 13.0, *)) {
1413
[deviceTypes addObject:AVCaptureDeviceTypeExternal];
@@ -21,10 +20,9 @@
2120
#pragma clang diagnostic pop
2221
}
2322

24-
AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession
25-
discoverySessionWithDeviceTypes:deviceTypes
26-
mediaType:AVMediaTypeVideo
27-
position:AVCaptureDevicePositionUnspecified];
23+
AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:deviceTypes
24+
mediaType:AVMediaTypeVideo
25+
position:AVCaptureDevicePositionUnspecified];
2826

2927
for (AVCaptureDevice *device in session.devices) {
3028
if (!device.localizedName || !device.uniqueID)

obs-studio-server/source/nodeobs_settings.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4091,11 +4091,11 @@ void OBS_settings::OBS_settings_getVideoDevices(void *data, const int64_t id, co
40914091
rval.push_back(ipc::value((uint32_t)0));
40924092
enumVideoDevices(rval);
40934093
#elif __APPLE__
4094-
// Here we do not invoke getDevices() because the mac-capture
4095-
// plugin will not enumerate video devices unless it is fully initialized.
4096-
// So instead, we will enumerate video devices manually. Hopefully,
4097-
// mac-capture doesn't do anything special to enumerate video devices.
4098-
// If so, then this implementation will need to be updated.
4094+
// Here we do not invoke getDevices() because the mac-capture
4095+
// plugin will not enumerate video devices unless it is fully initialized.
4096+
// So instead, we will enumerate video devices manually. Hopefully,
4097+
// mac-capture doesn't do anything special to enumerate video devices.
4098+
// If so, then this implementation will need to be updated.
40994099
auto devices = getVideoDevicesMacOS();
41004100
rval.push_back(ipc::value((uint64_t)devices.size()));
41014101
for (const auto &[name, uid] : devices) {

0 commit comments

Comments
 (0)