From 1f37c8af5a4a1695d40212800a6bf362900934d9 Mon Sep 17 00:00:00 2001
From: Edwin Jakobs <edwin@rndr.studio>
Date: Tue, 19 Nov 2019 12:30:34 +0100
Subject: [PATCH] Add toString and MidiTransceiver.open to simplify API use

---
 orx-midi/src/main/kotlin/MidiEvent.kt       |  5 ++++-
 orx-midi/src/main/kotlin/MidiTransceiver.kt | 23 ++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/orx-midi/src/main/kotlin/MidiEvent.kt b/orx-midi/src/main/kotlin/MidiEvent.kt
index 9e0348a2..ba14f5a3 100644
--- a/orx-midi/src/main/kotlin/MidiEvent.kt
+++ b/orx-midi/src/main/kotlin/MidiEvent.kt
@@ -6,7 +6,6 @@ enum class MidiEventType {
     CONTROL_CHANGED
 }
 
-
 class MidiEvent(val eventType: MidiEventType) {
     var origin = Origin.DEVICE
     var control: Int = 0
@@ -44,4 +43,8 @@ class MidiEvent(val eventType: MidiEventType) {
             return midiEvent
         }
     }
+
+    override fun toString(): String {
+        return "MidiEvent(eventType=$eventType, origin=$origin, control=$control, note=$note, channel=$channel, value=$value, velocity=$velocity)"
+    }
 }
\ No newline at end of file
diff --git a/orx-midi/src/main/kotlin/MidiTransceiver.kt b/orx-midi/src/main/kotlin/MidiTransceiver.kt
index 7369bf39..897627b0 100644
--- a/orx-midi/src/main/kotlin/MidiTransceiver.kt
+++ b/orx-midi/src/main/kotlin/MidiTransceiver.kt
@@ -7,9 +7,13 @@ data class MidiDeviceName(val name: String, val vendor: String)
 class MidiDeviceCapabilities {
     var receive: Boolean = false
     var transmit: Boolean = false
+
+    override fun toString(): String {
+        return "MidiDeviceCapabilities(receive=$receive, transmit=$transmit)"
+    }
 }
 
-class MidiDeviceDescription(val name: String, val vendor: String, val receive: Boolean, val transmit: Boolean) {
+data class MidiDeviceDescription(val name: String, val vendor: String, val receive: Boolean, val transmit: Boolean) {
     companion object {
         fun list(): List<MidiDeviceDescription> {
             val caps = mutableMapOf<MidiDeviceName, MidiDeviceCapabilities>()
@@ -34,6 +38,14 @@ class MidiDeviceDescription(val name: String, val vendor: String, val receive: B
             }
         }
     }
+
+    fun open() : MidiTransceiver {
+        require(receive && transmit) {
+            "device should be a receiver and transmitter"
+        }
+
+        return MidiTransceiver.fromDeviceVendor(name, vendor)
+    }
 }
 
 class MidiTransceiver(val receiverDevice: MidiDevice, val transmitterDevicer: MidiDevice) {
@@ -52,11 +64,9 @@ class MidiTransceiver(val receiverDevice: MidiDevice, val transmitterDevicer: Mi
                             if (device.maxTransmitters != 0 && device.maxReceivers == 0) {
                                 transmitterDevice = device
                             }
-
                             if (device.maxReceivers != 0 && device.maxTransmitters == 0) {
                                 receiverDevice = device
                             }
-
                         }
                     }
                 } catch (e: MidiUnavailableException) {
@@ -71,8 +81,6 @@ class MidiTransceiver(val receiverDevice: MidiDevice, val transmitterDevicer: Mi
             } else {
                 throw IllegalArgumentException("midi device not found ${name}:${vendor} ${receiverDevice} ${transmitterDevice}")
             }
-
-
         }
     }
 
@@ -95,9 +103,7 @@ class MidiTransceiver(val receiverDevice: MidiDevice, val transmitterDevicer: Mi
                     ShortMessage.CONTROL_CHANGE -> controlChanged.trigger(MidiEvent.controlChange(channel,cmd[1].toInt() and 0xff, cmd[2].toInt() and 0xff))
                 }
             }
-
             override fun close() {
-
             }
         }
     }
@@ -116,7 +122,6 @@ class MidiTransceiver(val receiverDevice: MidiDevice, val transmitterDevicer: Mi
         } catch (e: InvalidMidiDataException) {
             //
         }
-
     }
 
     fun noteOn(channel: Int, key: Int, velocity: Int) {
@@ -141,11 +146,9 @@ fun main() {
     MidiDeviceDescription.list().forEach {
         println("> ${it.name}, ${it.vendor} r:${it.receive} t:${it.transmit}")
     }
-
     val dev = MidiTransceiver.fromDeviceVendor("BCR2000 [hw:2,0,0]", "ALSA (http://www.alsa-project.org)")
     dev.controlChanged.listen {
         println("${it.channel} ${it.control} ${it.value}")
     }
-
 //    dev.destroy()
 }
\ No newline at end of file