Skip to content

Commit 5af3109

Browse files
nodefulnodeful
committed
fixes to driver installation
1 parent 3ba0144 commit 5af3109

7 files changed

Lines changed: 22 additions & 20 deletions

File tree

‎native/app/Embedded/eqMac.driver/Contents/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
<key>CFBundlePackageType</key>
2222
<string>BNDL</string>
2323
<key>CFBundleShortVersionString</key>
24-
<string>1.1.0</string>
24+
<string>1.1.1</string>
2525
<key>CFBundleSignature</key>
2626
<string>????</string>
2727
<key>CFBundleSupportedPlatforms</key>
2828
<array>
2929
<string>MacOSX</string>
3030
</array>
3131
<key>CFBundleVersion</key>
32-
<string>1.1.0</string>
32+
<string>1.1.1</string>
3333
<key>CFPlugInFactories</key>
3434
<dict>
3535
<key>7080ba34-76cc-40b2-b2b3-819d28460e7e</key>

‎native/app/Embedded/eqMac.driver/Contents/MacOS/eqMac‎

22.3 KB
Binary file not shown.

‎native/app/Source/Application.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class Application {
126126
) { install in
127127
if install {
128128
Driver.install(started: {
129-
UI.showLoadingWindow("Installing eqMac audio driver\nIf this process takes too long, please restart your Mac")
129+
UI.showLoadingWindow("Installing eqMac audio driver\nIf this process takes too long,\nplease restart your Mac")
130130
}) { success in
131131
if (success) {
132132
UI.hideLoadingWindow()
@@ -140,16 +140,16 @@ class Application {
140140
quit()
141141
}
142142
}
143-
} else if (Driver.isOutdated && Driver.skipCurrentVersion) {
143+
} else if (Driver.isOutdated && !Driver.skipCurrentVersion) {
144144
Alert.confirm(
145145
title: "Audio Driver Update",
146-
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.",
146+
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)",
147147
okText: "Update Driver",
148148
cancelText: "Skip Driver update"
149149
) { update in
150150
if update {
151151
Driver.install(started: {
152-
UI.showLoadingWindow("Updating eqMac audio driver\nIf this process takes too long, please restart your Mac")
152+
UI.showLoadingWindow("Updating eqMac audio driver\nIf this process takes too long,\nplease restart your Mac")
153153
}) { success in
154154
if (success) {
155155
UI.hideLoadingWindow()
@@ -535,7 +535,7 @@ class Application {
535535
self.stopEngines()
536536
self.switchBackToLastKnownDevice()
537537
UI.close()
538-
Utilities.delay(100) { UI.showLoadingWindow("Reinstalling eqMac driver\nIf this process takes too long, please restart your Mac") }
538+
Utilities.delay(100) { UI.showLoadingWindow("Reinstalling eqMac driver\nIf this process takes too long,\nplease restart your Mac") }
539539
}) { success in
540540
if (success) {
541541
UI.hideLoadingWindow()
@@ -558,7 +558,7 @@ class Application {
558558
self.stopEngines()
559559
self.switchBackToLastKnownDevice()
560560
UI.close()
561-
Utilities.delay(100) { UI.showLoadingWindow("Uninstalling eqMac\nIf this process takes too long, please restart your Mac") }
561+
Utilities.delay(100) { UI.showLoadingWindow("Uninstalling eqMac\nIf this process takes too long,\nplease restart your Mac") }
562562
}) { success in
563563
completion(success)
564564
if (success) {

‎native/app/Source/UI/Main.storyboard‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<autoresizingMask key="autoresizingMask"/>
3939
<subviews>
4040
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="G6Y-R8-Z81">
41-
<rect key="frame" x="-2" y="14" width="272" height="35"/>
41+
<rect key="frame" x="-2" y="0.0" width="272" height="54"/>
4242
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
4343
<textFieldCell key="cell" lineBreakMode="truncatingTail" alignment="center" title="Installing Driver" id="3Xg-7Y-udV">
4444
<font key="font" usesAppearanceFont="YES"/>

‎native/app/eqMac.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@
10381038
CODE_SIGN_IDENTITY = "Developer ID Application";
10391039
CODE_SIGN_STYLE = Manual;
10401040
COMBINE_HIDPI_IMAGES = YES;
1041-
CURRENT_PROJECT_VERSION = 0.3.1;
1041+
CURRENT_PROJECT_VERSION = 0.3.2;
10421042
DEFINES_MODULE = YES;
10431043
DEVELOPMENT_TEAM = JZA6C97KJA;
10441044
ENABLE_HARDENED_RUNTIME = YES;
@@ -1074,7 +1074,7 @@
10741074
"$(PROJECT_DIR)/Source/Vendor",
10751075
);
10761076
MACOSX_DEPLOYMENT_TARGET = 10.12;
1077-
MARKETING_VERSION = v0.3.1;
1077+
MARKETING_VERSION = v0.3.2;
10781078
PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac;
10791079
PRODUCT_NAME = "$(TARGET_NAME)";
10801080
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1098,7 +1098,7 @@
10981098
CODE_SIGN_IDENTITY = "Developer ID Application";
10991099
CODE_SIGN_STYLE = Manual;
11001100
COMBINE_HIDPI_IMAGES = YES;
1101-
CURRENT_PROJECT_VERSION = 0.3.1;
1101+
CURRENT_PROJECT_VERSION = 0.3.2;
11021102
DEFINES_MODULE = YES;
11031103
DEVELOPMENT_TEAM = JZA6C97KJA;
11041104
ENABLE_HARDENED_RUNTIME = YES;
@@ -1134,7 +1134,7 @@
11341134
"$(PROJECT_DIR)/Source/Vendor",
11351135
);
11361136
MACOSX_DEPLOYMENT_TARGET = 10.12;
1137-
MARKETING_VERSION = v0.3.1;
1137+
MARKETING_VERSION = v0.3.2;
11381138
PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac;
11391139
PRODUCT_NAME = "$(TARGET_NAME)";
11401140
PROVISIONING_PROFILE_SPECIFIER = "";

‎native/driver/Driver.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@
597597
CODE_SIGN_IDENTITY = "Developer ID Application";
598598
CODE_SIGN_STYLE = Manual;
599599
COMBINE_HIDPI_IMAGES = YES;
600-
CURRENT_PROJECT_VERSION = 1.1.0;
600+
CURRENT_PROJECT_VERSION = 1.1.1;
601601
DEBUG_INFORMATION_FORMAT = dwarf;
602602
DEVELOPMENT_TEAM = JZA6C97KJA;
603603
GCC_C_LANGUAGE_STANDARD = "compiler-default";
@@ -610,7 +610,7 @@
610610
GCC_WARN_UNUSED_VARIABLE = YES;
611611
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
612612
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Audio/Plug-Ins/HAL";
613-
MARKETING_VERSION = 1.1.0;
613+
MARKETING_VERSION = 1.1.1;
614614
MTL_ENABLE_DEBUG_INFO = YES;
615615
ONLY_ACTIVE_ARCH = YES;
616616
PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac.driver;
@@ -637,7 +637,7 @@
637637
CODE_SIGN_IDENTITY = "Developer ID Application";
638638
CODE_SIGN_STYLE = Manual;
639639
COMBINE_HIDPI_IMAGES = YES;
640-
CURRENT_PROJECT_VERSION = 1.1.0;
640+
CURRENT_PROJECT_VERSION = 1.1.1;
641641
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
642642
DEVELOPMENT_TEAM = JZA6C97KJA;
643643
ENABLE_NS_ASSERTIONS = NO;
@@ -650,7 +650,7 @@
650650
GCC_WARN_UNUSED_VARIABLE = YES;
651651
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
652652
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Audio/Plug-Ins/HAL";
653-
MARKETING_VERSION = 1.1.0;
653+
MARKETING_VERSION = 1.1.1;
654654
MTL_ENABLE_DEBUG_INFO = NO;
655655
PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac.driver;
656656
PRODUCT_NAME = "$(TARGET_NAME)";

‎native/driver/Source/EQM_Device.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,14 @@ void EQM_Device::StaticInitializer()
6666
kObjectID_Stream_Output,
6767
kObjectID_Volume_Output_Master,
6868
kObjectID_Mute_Output_Master);
69+
sInstance->Activate();
70+
6971
if (
70-
EQM_Utils::process_at_path_running("/Applications/eqMac.app/Contents/MacOS/eqMac")
71-
|| EQM_Utils::process_at_path_running("/Applications/Xcode.app/Contents/MacOS/Xcode")
72+
!EQM_Utils::process_at_path_running("/Applications/eqMac.app/Contents/MacOS/eqMac")
73+
&& !EQM_Utils::process_at_path_running("/Applications/Xcode.app/Contents/MacOS/Xcode")
7274
) {
7375
// Activate the Driver only if eqMac or Xcode are running from /Application folder
74-
sInstance->Activate();
76+
sInstance->Deactivate();
7577
} else {
7678
}
7779

0 commit comments

Comments
 (0)