Skip to content

Commit 1c4faad

Browse files
committed
allowing virtual devices
1 parent 5c37c09 commit 1c4faad

3 files changed

Lines changed: 21 additions & 19 deletions

File tree

native/app/Source/Audio/Outputs/Outputs.swift

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Outputs {
1919

2020
static func isDeviceAllowed(_ device: AudioDevice) -> Bool {
2121
return device.transportType != nil
22-
&& Constants.SUPPORTED_TRANSPORT_TYPES.contains(device.transportType!)
22+
&& SUPPORTED_TRANSPORT_TYPES.contains(device.transportType!)
2323
&& !device.isInputOnlyDevice()
2424
&& !device.name.contains("CADefaultDeviceAggregate")
2525
&& device.uid != Constants.DRIVER_DEVICE_UID
@@ -28,10 +28,25 @@ class Outputs {
2828

2929
static func shouldAutoSelect (_ device: AudioDevice) -> Bool {
3030
let types: [TransportType] = [.bluetooth, .bluetoothLE, .builtIn]
31-
return Outputs.isDeviceAllowed(device) && types.contains(device.transportType!)
31+
return isDeviceAllowed(device) && types.contains(device.transportType!)
3232
}
3333

3434
static var allowedDevices: [AudioDevice] {
3535
return AudioDevice.allOutputDevices().filter({ isDeviceAllowed($0) })
3636
}
37+
38+
static let SUPPORTED_TRANSPORT_TYPES = [
39+
TransportType.airPlay,
40+
TransportType.bluetooth,
41+
TransportType.bluetoothLE,
42+
TransportType.builtIn,
43+
TransportType.displayPort,
44+
TransportType.fireWire,
45+
TransportType.hdmi,
46+
TransportType.pci,
47+
TransportType.thunderbolt,
48+
TransportType.usb,
49+
TransportType.aggregate,
50+
TransportType.virtual
51+
]
3752
}

native/app/Source/Constants.swift

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,6 @@ struct Constants {
4343
static let TRANSITION_FPS: Double = 30
4444
static let TRANSITION_FRAME_DURATION: Double = 1000 / TRANSITION_FPS
4545
static let TRANSITION_FRAME_COUNT = UInt(round(TRANSITION_FPS * (Double(TRANSITION_DURATION) / 1000)))
46-
static let SUPPORTED_TRANSPORT_TYPES = [
47-
TransportType.airPlay,
48-
TransportType.bluetooth,
49-
TransportType.bluetoothLE,
50-
TransportType.builtIn,
51-
TransportType.displayPort,
52-
TransportType.fireWire,
53-
TransportType.hdmi,
54-
TransportType.pci,
55-
TransportType.thunderbolt,
56-
TransportType.usb,
57-
TransportType.aggregate
58-
]
5946
static let OPEN_SOURCE = true
6047
}
6148

native/app/eqMac.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@
992992
CODE_SIGN_IDENTITY = "-";
993993
CODE_SIGN_STYLE = Manual;
994994
COMBINE_HIDPI_IMAGES = YES;
995-
CURRENT_PROJECT_VERSION = 1.0.0;
995+
CURRENT_PROJECT_VERSION = 1.1.0;
996996
DEFINES_MODULE = YES;
997997
DEVELOPMENT_TEAM = "";
998998
ENABLE_HARDENED_RUNTIME = YES;
@@ -1031,7 +1031,7 @@
10311031
"$(PROJECT_DIR)/Source/Vendor",
10321032
);
10331033
MACOSX_DEPLOYMENT_TARGET = 10.12;
1034-
MARKETING_VERSION = v1.0.0;
1034+
MARKETING_VERSION = v1.1.0;
10351035
ONLY_ACTIVE_ARCH = YES;
10361036
PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac;
10371037
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1056,7 +1056,7 @@
10561056
CODE_SIGN_IDENTITY = "Developer ID Application";
10571057
CODE_SIGN_STYLE = Manual;
10581058
COMBINE_HIDPI_IMAGES = YES;
1059-
CURRENT_PROJECT_VERSION = 1.0.0;
1059+
CURRENT_PROJECT_VERSION = 1.1.0;
10601060
DEFINES_MODULE = YES;
10611061
DEVELOPMENT_TEAM = JZA6C97KJA;
10621062
ENABLE_HARDENED_RUNTIME = YES;
@@ -1095,7 +1095,7 @@
10951095
"$(PROJECT_DIR)/Source/Vendor",
10961096
);
10971097
MACOSX_DEPLOYMENT_TARGET = 10.12;
1098-
MARKETING_VERSION = v1.0.0;
1098+
MARKETING_VERSION = v1.1.0;
10991099
PRODUCT_BUNDLE_IDENTIFIER = com.bitgapp.eqmac;
11001100
PRODUCT_NAME = "$(TARGET_NAME)";
11011101
PROVISIONING_PROFILE_SPECIFIER = "";

0 commit comments

Comments
 (0)