Skip to content
Merged
Changes from all commits
Commits
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
21 changes: 14 additions & 7 deletions MiddleDrag/Managers/DeviceMonitor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ class DeviceMonitor {
Log.info("DeviceMonitor starting...", category: .device)

var deviceCount = 0
var registeredDevices: Set<UnsafeMutableRawPointer> = []

// Try to get all devices
if let deviceList = MTDeviceCreateList() {
Expand All @@ -82,6 +83,7 @@ class DeviceMonitor {
let deviceRef = UnsafeMutableRawPointer(mutating: dev)
MTRegisterContactFrameCallback(deviceRef, deviceContactCallback)
MTDeviceStart(deviceRef, 0)
registeredDevices.insert(deviceRef)
deviceCount += 1

if device == nil {
Expand All @@ -93,14 +95,19 @@ class DeviceMonitor {
Log.warning("MTDeviceCreateList returned nil, trying default device", category: .device)
}

// Also try the default device
// Also try the default device if not already registered
if let defaultDevice = MultitouchFramework.shared.getDefaultDevice() {
MTRegisterContactFrameCallback(defaultDevice, deviceContactCallback)
MTDeviceStart(defaultDevice, 0)
deviceCount += 1

if device == nil {
device = defaultDevice
if !registeredDevices.contains(defaultDevice) {
MTRegisterContactFrameCallback(defaultDevice, deviceContactCallback)
MTDeviceStart(defaultDevice, 0)
registeredDevices.insert(defaultDevice)
deviceCount += 1

if device == nil {
device = defaultDevice
}
} else {
Log.debug("Default device already registered from device list", category: .device)
}
}

Expand Down