fixed typing in android, better event type detection

Dante1349 · May 31, 2022 · 5c27c6b · 5c27c6b
1 parent ecdb847
commit 5c27c6b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/android/src/main/java/capacitormidi/MIDIPlugin.java b/android/src/main/java/capacitormidi/MIDIPlugin.java
@@ -6,7 +6,6 @@
 
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
-import com.getcapacitor.MessageHandler;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
@@ -47,21 +46,21 @@ public void openDevice(PluginCall call) {
             JSObject midiMessage = new JSObject();
 
             String rawType = String.valueOf(message.msg[1]);
+            int note = message.msg[2];
+            int velocity = message.msg[3];
+
             String type = "";
-            switch(rawType) {
-                case "-112":
-                    type = "NoteOn";
-                    break;
-                case "-128":
-                    type = "NoteOff";
-                    break;
-                default:
-                    type = "UNKNOWN - " + rawType;
-                    break;
+            if ( rawType.equals("-112") && velocity != 0 ) {
+                type = "NoteOn";
+            } else if ( (rawType.equals("-128") || rawType.equals("-112")) && velocity == 0 ) {
+                type = "NoteOff";
+            } else {
+                type = "UNKNOWN - " + rawType;
             }
+
             midiMessage.put("type", type);
-            midiMessage.put("note", String.valueOf(message.msg[2]));
-            midiMessage.put("velocity", String.valueOf(message.msg[3]));
+            midiMessage.put("note", note);
+            midiMessage.put("velocity", velocity);
 
             notifyListeners("MIDI_MSG_EVENT", midiMessage);
         });

diff --git a/android/src/main/java/capacitormidi/MidiMessageReceiver.java b/android/src/main/java/capacitormidi/MidiMessageReceiver.java
@@ -19,7 +19,15 @@ public MidiMessageReceiver(Consumer<MIDIDeviceMessage> consumer) {
     @RequiresApi(api = Build.VERSION_CODES.N)
     @Override
     public void onSend(byte[] msg, int offset, int count, long timestamp) throws IOException {
-        Log.i("MidiMessageReceiver", "msg: " + msg + ", offset: " + offset + ", count: " + count + ", timestamp: " + timestamp);
+        String message = "["
+                +String.valueOf(msg[0])+","
+                +String.valueOf(msg[1])+","
+                +String.valueOf(msg[2])+","
+                +String.valueOf(msg[3])+","
+                +String.valueOf(msg[4])+","
+                +String.valueOf(msg[5])+","
+                +"]";
+        Log.i("MidiMessageReceiver", "msg: " + message + ", offset: " + offset + ", count: " + count + ", timestamp: " + timestamp);
         consumer.accept(new MIDIDeviceMessage(msg, offset, count, timestamp));
     }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capacitor-midi",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Grants access to midi devices via native libraries or WebMIDI.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",