Merge pull request #60 from MiguelGuthridge/miguel/fix-lk-macos-recog…

…nition Fix bug where some Launchkey devices weren't detected on MacOS
MaddyGuthridge · Oct 6, 2022 · af912be · af912be
2 parents 2f5269b + b0fbf4e
commit af912be
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/devices/novation/launchkey/mk3/lk_25_37.py b/src/devices/novation/launchkey/mk3/lk_25_37.py
@@ -100,7 +100,13 @@ def getDrumPadSize(cls) -> tuple[int, int]:
         return 2, 8
 
     def getDeviceNumber(self) -> int:
-        return 2 if '2' in device.getName() else 1
+        if (
+            'MIDIIN2' in device.getName()
+            or 'DAW' in device.getName()
+        ):
+            return 2
+        else:
+            return 1
 
     @classmethod
     def create(cls, event: FlMidiMsg = None, id: str = None) -> 'Device':

diff --git a/src/devices/novation/launchkey/mk3/lk_49_61.py b/src/devices/novation/launchkey/mk3/lk_49_61.py
@@ -112,7 +112,13 @@ def getDrumPadSize(cls) -> tuple[int, int]:
         return 2, 8
 
     def getDeviceNumber(self) -> int:
-        return 2 if '2' in device.getName() else 1
+        if (
+            'MIDIIN2' in device.getName()
+            or 'DAW' in device.getName()
+        ):
+            return 2
+        else:
+            return 1
 
     @classmethod
     def create(cls, event: FlMidiMsg = None, id: str = None) -> 'Device':

diff --git a/src/devices/novation/launchkey/mk3_mini/mini.py b/src/devices/novation/launchkey/mk3_mini/mini.py
@@ -70,7 +70,13 @@ def getDrumPadSize(cls) -> tuple[int, int]:
         return 2, 8
 
     def getDeviceNumber(self) -> int:
-        return 2 if '2' in device.getName() else 1
+        if (
+            'MIDIIN2' in device.getName()
+            or 'DAW' in device.getName()
+        ):
+            return 2
+        else:
+            return 1
 
     @classmethod
     def create(cls, event: FlMidiMsg = None, id: str = None) -> 'Device':