Skip to content

Apply fix for macOS Monterey #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
itaybre merged 1 commit into from
Oct 31, 2021
+38 −16
Merged

Apply fix for macOS Monterey #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions CameraController.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_ASSET_PATHS = "\"CameraController/Preview Content\"";
DEVELOPMENT_TEAM = PY9WJ3M9MW;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -845,7 +845,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.2.1;
MARKETING_VERSION = 1.3;
PRODUCT_BUNDLE_IDENTIFIER = com.itaysoft.CameraController;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -862,7 +862,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_ASSET_PATHS = "\"CameraController/Preview Content\"";
DEVELOPMENT_TEAM = PY9WJ3M9MW;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -874,7 +874,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.2.1;
MARKETING_VERSION = 1.3;
PRODUCT_BUNDLE_IDENTIFIER = com.itaysoft.CameraController;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -933,8 +933,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Helper/Helper.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_ASSET_PATHS = "\"Helper/Preview Content\"";
DEVELOPMENT_TEAM = PY9WJ3M9MW;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -945,8 +947,10 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.3;
PRODUCT_BUNDLE_IDENTIFIER = com.itaysoft.CameraController.Helper;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
};
Expand All @@ -957,8 +961,10 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Helper/Helper.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_ASSET_PATHS = "\"Helper/Preview Content\"";
DEVELOPMENT_TEAM = PY9WJ3M9MW;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -969,8 +975,10 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.3;
PRODUCT_BUNDLE_IDENTIFIER = com.itaysoft.CameraController.Helper;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
};
Expand Down
34 changes: 24 additions & 10 deletions CameraController/UVC/Models/Controls/UVCControl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,18 @@ class UVCControl {
wLength: UInt16(length),
pData: &value,
wLenDone: 0)
guard
interface.pointee.pointee.USBInterfaceOpen(interface) == kIOReturnSuccess,
interface.pointee.pointee.ControlRequest(interface, 0, &request) == kIOReturnSuccess,
interface.pointee.pointee.USBInterfaceClose(interface) == kIOReturnSuccess else {
return 0
if #available(macOS 12.0, *) {
guard
interface.pointee.pointee.ControlRequest(interface, 0, &request) == kIOReturnSuccess else {
return 0
}
} else {
guard
interface.pointee.pointee.USBInterfaceOpenSeize(interface) == kIOReturnSuccess,
interface.pointee.pointee.ControlRequest(interface, 0, &request) == kIOReturnSuccess,
interface.pointee.pointee.USBInterfaceClose(interface) == kIOReturnSuccess else {
return 0
}
}

return value
Expand All @@ -65,11 +72,18 @@ class UVCControl {
pData: &ref,
wLenDone: 0)

guard
interface.pointee.pointee.USBInterfaceOpen(interface) == kIOReturnSuccess,
interface.pointee.pointee.ControlRequest(interface, 0, &request) == kIOReturnSuccess,
interface.pointee.pointee.USBInterfaceClose(interface) == kIOReturnSuccess else {
return false
if #available(macOS 12.0, *) {
guard
interface.pointee.pointee.ControlRequest(interface, 0, &request) == kIOReturnSuccess else {
return false
}
} else {
guard
interface.pointee.pointee.USBInterfaceOpenSeize(interface) == kIOReturnSuccess,
interface.pointee.pointee.ControlRequest(interface, 0, &request) == kIOReturnSuccess,
interface.pointee.pointee.USBInterfaceClose(interface) == kIOReturnSuccess else {
return false
}
}

return true
Expand Down
4 changes: 2 additions & 2 deletions Helper/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>1</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.photography</string>
<key>LSBackgroundOnly</key>
Expand Down