Skip to content

Commit

Permalink
fixes to driver installation
Browse files Browse the repository at this point in the history
  • Loading branch information
@nodeful
nodeful committed Jun 24, 2020
1 parent 3ba0144 commit 5af3109
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 20 deletions.
4 changes: 2 additions & 2 deletions native/app/Embedded/eqMac.driver/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.0</string>
<string>1.1.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>1.1.0</string>
<string>1.1.1</string>
<key>CFPlugInFactories</key>
<dict>
<key>7080ba34-76cc-40b2-b2b3-819d28460e7e</key>
Expand Down
Binary file modified native/app/Embedded/eqMac.driver/Contents/MacOS/eqMac
View file
Binary file not shown.
12 changes: 6 additions & 6 deletions native/app/Source/Application.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class Application {
) { install in
if install {
Driver.install(started: {
UI.showLoadingWindow("Installing eqMac audio driver\nIf this process takes too long, please restart your Mac")
UI.showLoadingWindow("Installing eqMac audio driver\nIf this process takes too long,\nplease restart your Mac")
}) { success in
if (success) {
UI.hideLoadingWindow()
Expand All @@ -140,16 +140,16 @@ class Application {
quit()
}
}
} else if (Driver.isOutdated && Driver.skipCurrentVersion) {
} else if (Driver.isOutdated && !Driver.skipCurrentVersion) {
Alert.confirm(
title: "Audio Driver Update",
message: "There is an optional Audio Driver update that should improve user experience. \nIn order to update eqMac will ask for your System Password. \nPlease close any apps playing audio (Spotify, YouTube etc.) otherwise installation might fail.",
message: "There is an optional Audio Driver update that should improve user experience. \nIn order to update eqMac will ask for your System Password. \nPlease close any apps playing audio (Spotify, YouTube etc.) otherwise installation might fail.\nVersion change: \(Driver.lastInstalledVersion ?? "1.0.0") -> \(Driver.bundledVersion)",
okText: "Update Driver",
cancelText: "Skip Driver update"
) { update in
if update {
Driver.install(started: {
UI.showLoadingWindow("Updating eqMac audio driver\nIf this process takes too long, please restart your Mac")
UI.showLoadingWindow("Updating eqMac audio driver\nIf this process takes too long,\nplease restart your Mac")
}) { success in
if (success) {
UI.hideLoadingWindow()
Expand Down Expand Up @@ -535,7 +535,7 @@ class Application {
self.stopEngines()
self.switchBackToLastKnownDevice()
UI.close()
Utilities.delay(100) { UI.showLoadingWindow("Reinstalling eqMac driver\nIf this process takes too long, please restart your Mac") }
Utilities.delay(100) { UI.showLoadingWindow("Reinstalling eqMac driver\nIf this process takes too long,\nplease restart your Mac") }
}) { success in
if (success) {
UI.hideLoadingWindow()
Expand All @@ -558,7 +558,7 @@ class Application {
self.stopEngines()
self.switchBackToLastKnownDevice()
UI.close()
Utilities.delay(100) { UI.showLoadingWindow("Uninstalling eqMac\nIf this process takes too long, please restart your Mac") }
Utilities.delay(100) { UI.showLoadingWindow("Uninstalling eqMac\nIf this process takes too long,\nplease restart your Mac") }
}) { success in
completion(success)
if (success) {
Expand Down
2 changes: 1 addition & 1 deletion native/app/Source/UI/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="G6Y-R8-Z81">
<rect key="frame" x="-2" y="14" width="272" height="35"/>
<rect key="frame" x="-2" y="0.0" width="272" height="54"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" alignment="center" title="Installing Driver" id="3Xg-7Y-udV">
<font key="font" usesAppearanceFont="YES"/>
Expand Down
8 changes: 4 additions & 4 deletions native/app/eqMac.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 0.3.1;
CURRENT_PROJECT_VERSION = 0.3.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = JZA6C97KJA;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down Expand Up @@ -1074,7 +1074,7 @@
"$(PROJECT_DIR)/Source/Vendor",
);
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = v0.3.1;
MARKETING_VERSION = v0.3.2;
PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -1098,7 +1098,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 0.3.1;
CURRENT_PROJECT_VERSION = 0.3.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = JZA6C97KJA;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down Expand Up @@ -1134,7 +1134,7 @@
"$(PROJECT_DIR)/Source/Vendor",
);
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = v0.3.1;
MARKETING_VERSION = v0.3.2;
PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
8 changes: 4 additions & 4 deletions native/driver/Driver.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.1.0;
CURRENT_PROJECT_VERSION = 1.1.1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = JZA6C97KJA;
GCC_C_LANGUAGE_STANDARD = "compiler-default";
Expand All @@ -610,7 +610,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Audio/Plug-Ins/HAL";
MARKETING_VERSION = 1.1.0;
MARKETING_VERSION = 1.1.1;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac.driver;
Expand All @@ -637,7 +637,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.1.0;
CURRENT_PROJECT_VERSION = 1.1.1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = JZA6C97KJA;
ENABLE_NS_ASSERTIONS = NO;
Expand All @@ -650,7 +650,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Audio/Plug-Ins/HAL";
MARKETING_VERSION = 1.1.0;
MARKETING_VERSION = 1.1.1;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac.driver;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
8 changes: 5 additions & 3 deletions native/driver/Source/EQM_Device.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,14 @@ void EQM_Device::StaticInitializer()
kObjectID_Stream_Output,
kObjectID_Volume_Output_Master,
kObjectID_Mute_Output_Master);
sInstance->Activate();

if (
EQM_Utils::process_at_path_running("/Applications/eqMac.app/Contents/MacOS/eqMac")
|| EQM_Utils::process_at_path_running("/Applications/Xcode.app/Contents/MacOS/Xcode")
!EQM_Utils::process_at_path_running("/Applications/eqMac.app/Contents/MacOS/eqMac")
&& !EQM_Utils::process_at_path_running("/Applications/Xcode.app/Contents/MacOS/Xcode")
) {
// Activate the Driver only if eqMac or Xcode are running from /Application folder
sInstance->Activate();
sInstance->Deactivate();
} else {
}

Expand Down

0 comments on commit 5af3109

Please sign in to comment.