Working on getting supervision tree right

1 files changed, 17 insertions, 16 deletions

diff --git a/src/midi.clj b/src/midi.clj
index ca70273..4c10de0 100644
--- a/src/midi.clj
+++ b/src/midi.clj
@@ -58,21 +58,22 @@
   "Returns a device for given device name. Returns nil if device not found."
   [device-name with-device]
   (m/ap
-    (when-let [device-info (m/?< (>device-info device-name))]
-      (let [^MidiDevice device (MidiSystem/getMidiDevice ^MidiDevice$Info device-info)]
-        ;; Essential problem: Combining taking element from flow to put in
-        ;; conditional, and cleaning up in catch.
-        ;; NOTE: You need the MidiDevice type hint when you call open and close!
-        (try
-          (println "Opening device")
-          (m/? (m/via m/blk (.open device)))
-          (println "Device opened")
-          (m/?< (with-device device))
-          (finally
-            (println "Closing device")
-            (m/compel (m/? (m/via m/blk (.close device))))
-            (println "Device closed")
-            ))))))
+   (let [device-info
+         (m/?< (>device-info device-name))
+         ^MidiDevice device (MidiSystem/getMidiDevice ^MidiDevice$Info device-info)]
+      ;; Essential problem: Combining taking element from flow to put in
+      ;; conditional, and cleaning up in catch.
+      ;; NOTE: You need the MidiDevice type hint when you call open and close!
+     (try
+       (println "Opening device")
+       (m/? (m/via m/blk (.open device)))
+       (println "Device opened")
+       (m/?< (with-device device))
+       (finally
+         (println "Closing device")
+         (m/compel (m/? (m/via m/blk (.close device))))
+         (println "Device closed")
+         )))))
 
 (defn new-device
   "Generate a new midi device.
@@ -111,7 +112,7 @@
 (def run
   (m/ap
     (prn  (m/?< (>device (m/?< >bus-sel)
-                         (fn [v] (m/ap (m/amb  (m/?< v)))))))
+                         >midi-messages)))
     ))
 
 (def close ((m/reduce prn {} run) {} {}))