mv

ejconlon · Dec 18, 2024 · 5cbd935 · 5cbd935
1 parent 31a9a2a
commit 5cbd935
Show file tree

Hide file tree

Showing 143 changed files with 29 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Probably some FFI bugs in there, haven't tested it all yet.
 ## Development
 
 You will need to checkout the submodule and run `just vendor` to copy the `libremidi` sources
-into the Haskell build tree (to `libremidi/vendor`).
+into the Haskell build tree (to `libremidi`).
 
 ## License
 

diff --git a/justfile b/justfile
@@ -51,8 +51,9 @@ exe:
 
 # Copy libremidi sources into build tree
 vendor:
-  rm -rf libremidi/vendor
-  cp -r submodules/libremidi/include libremidi/vendor
-  cp submodules/readerwriterqueue/atomicops.h libremidi/vendor
-  cp submodules/readerwriterqueue/readerwriterqueue.h libremidi/vendor
+  rm -f libremidi/*.h
+  rm -rf libremidi/libremidi
+  cp -r submodules/libremidi/include/libremidi libremidi
+  cp submodules/readerwriterqueue/atomicops.h libremidi
+  cp submodules/readerwriterqueue/readerwriterqueue.h libremidi
 
diff --git a/libremidi/vendor/atomicops.h → libremidi/atomicops.h b/libremidi/vendor/atomicops.h → libremidi/atomicops.h
diff --git a/libremidi/libremidi.cabal b/libremidi/libremidi.cabal
@@ -5,7 +5,7 @@ cabal-version: 2.2
 -- see: https://github.com/sol/hpack
 
 name:           libremidi
-version:        0.1.1
+version:        0.2.0
 synopsis:       libremidi bindings for haskell
 description:    Please see the README on GitHub at <https://github.com/ejconlon/libremidi-haskell#readme>
 homepage:       https://github.com/ejconlon/libremidi-haskell#readme
@@ -65,18 +65,18 @@ library
       TypeFamilies
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wpartial-fields -Wredundant-constraints -fno-warn-unused-top-binds
   include-dirs:
-      vendor
+      ./
   install-includes:
-      vendor/libremidi/libremidi-c.h
+      libremidi/libremidi-c.h
   cxx-sources:
-      vendor/libremidi/client.cpp
-      vendor/libremidi/libremidi-c.cpp
-      vendor/libremidi/libremidi.cpp
-      vendor/libremidi/midi_in.cpp
-      vendor/libremidi/midi_out.cpp
-      vendor/libremidi/observer.cpp
-      vendor/libremidi/reader.cpp
-      vendor/libremidi/writer.cpp
+      libremidi/client.cpp
+      libremidi/libremidi-c.cpp
+      libremidi/libremidi.cpp
+      libremidi/midi_in.cpp
+      libremidi/midi_out.cpp
+      libremidi/observer.cpp
+      libremidi/reader.cpp
+      libremidi/writer.cpp
   extra-libraries:
       stdc++
   build-depends:
@@ -140,7 +140,7 @@ executable libremidi-exe
       TypeFamilies
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wpartial-fields -Wredundant-constraints -fno-warn-unused-top-binds -threaded -rtsopts -with-rtsopts=-N
   install-includes:
-      vendor/libremidi/libremidi-c.h
+      libremidi/libremidi-c.h
   build-depends:
       base >=4.12 && <5
     , containers >=0.6.7 && <0.7
@@ -192,7 +192,7 @@ test-suite libremidi-test
       TypeFamilies
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wpartial-fields -Wredundant-constraints -fno-warn-unused-top-binds -threaded -rtsopts -with-rtsopts=-N
   install-includes:
-      vendor/libremidi/libremidi-c.h
+      libremidi/libremidi-c.h
   build-depends:
       base >=4.12 && <5
     , containers >=0.6.7 && <0.7

diff --git a/libremidi/vendor/libremidi/api-c.h → libremidi/libremidi/api-c.h b/libremidi/vendor/libremidi/api-c.h → libremidi/libremidi/api-c.h
diff --git a/libremidi/vendor/libremidi/api.hpp → libremidi/libremidi/api.hpp b/libremidi/vendor/libremidi/api.hpp → libremidi/libremidi/api.hpp
diff --git a/libremidi/vendor/libremidi/backends.hpp → libremidi/libremidi/backends.hpp b/libremidi/vendor/libremidi/backends.hpp → libremidi/libremidi/backends.hpp
diff --git a/...di/vendor/libremidi/backends/alsa_raw.hpp → libremidi/libremidi/backends/alsa_raw.hpp b/...di/vendor/libremidi/backends/alsa_raw.hpp → libremidi/libremidi/backends/alsa_raw.hpp
diff --git a/...or/libremidi/backends/alsa_raw/config.hpp → ...di/libremidi/backends/alsa_raw/config.hpp b/...or/libremidi/backends/alsa_raw/config.hpp → ...di/libremidi/backends/alsa_raw/config.hpp
diff --git a/...remidi/backends/alsa_raw/error_domain.hpp → ...remidi/backends/alsa_raw/error_domain.hpp b/...remidi/backends/alsa_raw/error_domain.hpp → ...remidi/backends/alsa_raw/error_domain.hpp
diff --git a/...r/libremidi/backends/alsa_raw/helpers.hpp → ...i/libremidi/backends/alsa_raw/helpers.hpp b/...r/libremidi/backends/alsa_raw/helpers.hpp → ...i/libremidi/backends/alsa_raw/helpers.hpp
diff --git a/...r/libremidi/backends/alsa_raw/midi_in.hpp → ...i/libremidi/backends/alsa_raw/midi_in.hpp b/...r/libremidi/backends/alsa_raw/midi_in.hpp → ...i/libremidi/backends/alsa_raw/midi_in.hpp
diff --git a/.../libremidi/backends/alsa_raw/midi_out.hpp → .../libremidi/backends/alsa_raw/midi_out.hpp b/.../libremidi/backends/alsa_raw/midi_out.hpp → .../libremidi/backends/alsa_raw/midi_out.hpp
diff --git a/.../libremidi/backends/alsa_raw/observer.hpp → .../libremidi/backends/alsa_raw/observer.hpp b/.../libremidi/backends/alsa_raw/observer.hpp → .../libremidi/backends/alsa_raw/observer.hpp
diff --git a/...endor/libremidi/backends/alsa_raw_ump.hpp → ...emidi/libremidi/backends/alsa_raw_ump.hpp b/...endor/libremidi/backends/alsa_raw_ump.hpp → ...emidi/libremidi/backends/alsa_raw_ump.hpp
diff --git a/...ibremidi/backends/alsa_raw_ump/config.hpp → ...ibremidi/backends/alsa_raw_ump/config.hpp b/...ibremidi/backends/alsa_raw_ump/config.hpp → ...ibremidi/backends/alsa_raw_ump/config.hpp
diff --git a/...bremidi/backends/alsa_raw_ump/helpers.hpp → ...bremidi/backends/alsa_raw_ump/helpers.hpp b/...bremidi/backends/alsa_raw_ump/helpers.hpp → ...bremidi/backends/alsa_raw_ump/helpers.hpp
diff --git a/...bremidi/backends/alsa_raw_ump/midi_in.hpp → ...bremidi/backends/alsa_raw_ump/midi_in.hpp b/...bremidi/backends/alsa_raw_ump/midi_in.hpp → ...bremidi/backends/alsa_raw_ump/midi_in.hpp
diff --git a/...remidi/backends/alsa_raw_ump/midi_out.hpp → ...remidi/backends/alsa_raw_ump/midi_out.hpp b/...remidi/backends/alsa_raw_ump/midi_out.hpp → ...remidi/backends/alsa_raw_ump/midi_out.hpp
diff --git a/...remidi/backends/alsa_raw_ump/observer.hpp → ...remidi/backends/alsa_raw_ump/observer.hpp b/...remidi/backends/alsa_raw_ump/observer.hpp → ...remidi/backends/alsa_raw_ump/observer.hpp
diff --git a/...di/vendor/libremidi/backends/alsa_seq.hpp → libremidi/libremidi/backends/alsa_seq.hpp b/...di/vendor/libremidi/backends/alsa_seq.hpp → libremidi/libremidi/backends/alsa_seq.hpp
diff --git a/...or/libremidi/backends/alsa_seq/config.hpp → ...di/libremidi/backends/alsa_seq/config.hpp b/...or/libremidi/backends/alsa_seq/config.hpp → ...di/libremidi/backends/alsa_seq/config.hpp
diff --git a/...r/libremidi/backends/alsa_seq/helpers.hpp → ...i/libremidi/backends/alsa_seq/helpers.hpp b/...r/libremidi/backends/alsa_seq/helpers.hpp → ...i/libremidi/backends/alsa_seq/helpers.hpp
diff --git a/...r/libremidi/backends/alsa_seq/midi_in.hpp → ...i/libremidi/backends/alsa_seq/midi_in.hpp b/...r/libremidi/backends/alsa_seq/midi_in.hpp → ...i/libremidi/backends/alsa_seq/midi_in.hpp
diff --git a/.../libremidi/backends/alsa_seq/midi_out.hpp → .../libremidi/backends/alsa_seq/midi_out.hpp b/.../libremidi/backends/alsa_seq/midi_out.hpp → .../libremidi/backends/alsa_seq/midi_out.hpp
diff --git a/.../libremidi/backends/alsa_seq/observer.hpp → .../libremidi/backends/alsa_seq/observer.hpp b/.../libremidi/backends/alsa_seq/observer.hpp → .../libremidi/backends/alsa_seq/observer.hpp
diff --git a/...midi/backends/alsa_seq/shared_handler.hpp → ...midi/backends/alsa_seq/shared_handler.hpp b/...midi/backends/alsa_seq/shared_handler.hpp → ...midi/backends/alsa_seq/shared_handler.hpp
diff --git a/...endor/libremidi/backends/alsa_seq_ump.hpp → ...emidi/libremidi/backends/alsa_seq_ump.hpp b/...endor/libremidi/backends/alsa_seq_ump.hpp → ...emidi/libremidi/backends/alsa_seq_ump.hpp
diff --git a/...ibremidi/backends/alsa_seq_ump/config.hpp → ...ibremidi/backends/alsa_seq_ump/config.hpp b/...ibremidi/backends/alsa_seq_ump/config.hpp → ...ibremidi/backends/alsa_seq_ump/config.hpp
diff --git a/...bremidi/backends/alsa_seq_ump/helpers.hpp → ...bremidi/backends/alsa_seq_ump/helpers.hpp b/...bremidi/backends/alsa_seq_ump/helpers.hpp → ...bremidi/backends/alsa_seq_ump/helpers.hpp
diff --git a/...remidi/backends/alsa_seq_ump/midi_out.hpp → ...remidi/backends/alsa_seq_ump/midi_out.hpp b/...remidi/backends/alsa_seq_ump/midi_out.hpp → ...remidi/backends/alsa_seq_ump/midi_out.hpp
diff --git a/...di/vendor/libremidi/backends/coremidi.hpp → libremidi/libremidi/backends/coremidi.hpp b/...di/vendor/libremidi/backends/coremidi.hpp → libremidi/libremidi/backends/coremidi.hpp
diff --git a/...or/libremidi/backends/coremidi/config.hpp → ...di/libremidi/backends/coremidi/config.hpp b/...or/libremidi/backends/coremidi/config.hpp → ...di/libremidi/backends/coremidi/config.hpp
diff --git a/...remidi/backends/coremidi/error_domain.hpp → ...remidi/backends/coremidi/error_domain.hpp b/...remidi/backends/coremidi/error_domain.hpp → ...remidi/backends/coremidi/error_domain.hpp
diff --git a/...r/libremidi/backends/coremidi/helpers.hpp → ...i/libremidi/backends/coremidi/helpers.hpp b/...r/libremidi/backends/coremidi/helpers.hpp → ...i/libremidi/backends/coremidi/helpers.hpp
diff --git a/...r/libremidi/backends/coremidi/midi_in.hpp → ...i/libremidi/backends/coremidi/midi_in.hpp b/...r/libremidi/backends/coremidi/midi_in.hpp → ...i/libremidi/backends/coremidi/midi_in.hpp
diff --git a/.../libremidi/backends/coremidi/midi_out.hpp → .../libremidi/backends/coremidi/midi_out.hpp b/.../libremidi/backends/coremidi/midi_out.hpp → .../libremidi/backends/coremidi/midi_out.hpp
diff --git a/.../libremidi/backends/coremidi/observer.hpp → .../libremidi/backends/coremidi/observer.hpp b/.../libremidi/backends/coremidi/observer.hpp → .../libremidi/backends/coremidi/observer.hpp
diff --git a/...endor/libremidi/backends/coremidi_ump.hpp → ...emidi/libremidi/backends/coremidi_ump.hpp b/...endor/libremidi/backends/coremidi_ump.hpp → ...emidi/libremidi/backends/coremidi_ump.hpp
diff --git a/...ibremidi/backends/coremidi_ump/config.hpp → ...ibremidi/backends/coremidi_ump/config.hpp b/...ibremidi/backends/coremidi_ump/config.hpp → ...ibremidi/backends/coremidi_ump/config.hpp
diff --git a/...bremidi/backends/coremidi_ump/helpers.hpp → ...bremidi/backends/coremidi_ump/helpers.hpp b/...bremidi/backends/coremidi_ump/helpers.hpp → ...bremidi/backends/coremidi_ump/helpers.hpp
diff --git a/...bremidi/backends/coremidi_ump/midi_in.hpp → ...bremidi/backends/coremidi_ump/midi_in.hpp b/...bremidi/backends/coremidi_ump/midi_in.hpp → ...bremidi/backends/coremidi_ump/midi_in.hpp
diff --git a/...remidi/backends/coremidi_ump/midi_out.hpp → ...remidi/backends/coremidi_ump/midi_out.hpp b/...remidi/backends/coremidi_ump/midi_out.hpp → ...remidi/backends/coremidi_ump/midi_out.hpp
diff --git a/...remidi/backends/coremidi_ump/observer.hpp → ...remidi/backends/coremidi_ump/observer.hpp b/...remidi/backends/coremidi_ump/observer.hpp → ...remidi/backends/coremidi_ump/observer.hpp
diff --git a/...emidi/vendor/libremidi/backends/dummy.hpp → libremidi/libremidi/backends/dummy.hpp b/...emidi/vendor/libremidi/backends/dummy.hpp → libremidi/libremidi/backends/dummy.hpp
diff --git a/.../vendor/libremidi/backends/emscripten.hpp → libremidi/libremidi/backends/emscripten.hpp b/.../vendor/libremidi/backends/emscripten.hpp → libremidi/libremidi/backends/emscripten.hpp
diff --git a/.../libremidi/backends/emscripten/config.hpp → .../libremidi/backends/emscripten/config.hpp b/.../libremidi/backends/emscripten/config.hpp → .../libremidi/backends/emscripten/config.hpp
diff --git a/...libremidi/backends/emscripten/helpers.hpp → ...libremidi/backends/emscripten/helpers.hpp b/...libremidi/backends/emscripten/helpers.hpp → ...libremidi/backends/emscripten/helpers.hpp
diff --git a/...emidi/backends/emscripten/midi_access.cpp → ...emidi/backends/emscripten/midi_access.cpp b/...emidi/backends/emscripten/midi_access.cpp → ...emidi/backends/emscripten/midi_access.cpp
diff --git a/...emidi/backends/emscripten/midi_access.hpp → ...emidi/backends/emscripten/midi_access.hpp b/...emidi/backends/emscripten/midi_access.hpp → ...emidi/backends/emscripten/midi_access.hpp
diff --git a/...libremidi/backends/emscripten/midi_in.cpp → ...libremidi/backends/emscripten/midi_in.cpp b/...libremidi/backends/emscripten/midi_in.cpp → ...libremidi/backends/emscripten/midi_in.cpp
diff --git a/...libremidi/backends/emscripten/midi_in.hpp → ...libremidi/backends/emscripten/midi_in.hpp b/...libremidi/backends/emscripten/midi_in.hpp → ...libremidi/backends/emscripten/midi_in.hpp
diff --git a/...ibremidi/backends/emscripten/midi_out.cpp → ...ibremidi/backends/emscripten/midi_out.cpp b/...ibremidi/backends/emscripten/midi_out.cpp → ...ibremidi/backends/emscripten/midi_out.cpp
diff --git a/...ibremidi/backends/emscripten/midi_out.hpp → ...ibremidi/backends/emscripten/midi_out.hpp b/...ibremidi/backends/emscripten/midi_out.hpp → ...ibremidi/backends/emscripten/midi_out.hpp
diff --git a/...ibremidi/backends/emscripten/observer.cpp → ...ibremidi/backends/emscripten/observer.cpp b/...ibremidi/backends/emscripten/observer.cpp → ...ibremidi/backends/emscripten/observer.cpp
diff --git a/...ibremidi/backends/emscripten/observer.hpp → ...ibremidi/backends/emscripten/observer.hpp b/...ibremidi/backends/emscripten/observer.hpp → ...ibremidi/backends/emscripten/observer.hpp
diff --git a/libremidi/vendor/libremidi/backends/jack.hpp → libremidi/libremidi/backends/jack.hpp b/libremidi/vendor/libremidi/backends/jack.hpp → libremidi/libremidi/backends/jack.hpp
diff --git a/...vendor/libremidi/backends/jack/config.hpp → libremidi/libremidi/backends/jack/config.hpp b/...vendor/libremidi/backends/jack/config.hpp → libremidi/libremidi/backends/jack/config.hpp
diff --git a/.../libremidi/backends/jack/error_domain.hpp → .../libremidi/backends/jack/error_domain.hpp b/.../libremidi/backends/jack/error_domain.hpp → .../libremidi/backends/jack/error_domain.hpp
diff --git a/...endor/libremidi/backends/jack/helpers.hpp → ...emidi/libremidi/backends/jack/helpers.hpp b/...endor/libremidi/backends/jack/helpers.hpp → ...emidi/libremidi/backends/jack/helpers.hpp
diff --git a/...endor/libremidi/backends/jack/midi_in.hpp → ...emidi/libremidi/backends/jack/midi_in.hpp b/...endor/libremidi/backends/jack/midi_in.hpp → ...emidi/libremidi/backends/jack/midi_in.hpp
diff --git a/...ndor/libremidi/backends/jack/midi_out.hpp → ...midi/libremidi/backends/jack/midi_out.hpp b/...ndor/libremidi/backends/jack/midi_out.hpp → ...midi/libremidi/backends/jack/midi_out.hpp
diff --git a/...ndor/libremidi/backends/jack/observer.hpp → ...midi/libremidi/backends/jack/observer.hpp b/...ndor/libremidi/backends/jack/observer.hpp → ...midi/libremidi/backends/jack/observer.hpp
diff --git a/...ibremidi/backends/jack/shared_handler.hpp → ...ibremidi/backends/jack/shared_handler.hpp b/...ibremidi/backends/jack/shared_handler.hpp → ...ibremidi/backends/jack/shared_handler.hpp
diff --git a/...di/vendor/libremidi/backends/keyboard.hpp → libremidi/libremidi/backends/keyboard.hpp b/...di/vendor/libremidi/backends/keyboard.hpp → libremidi/libremidi/backends/keyboard.hpp
diff --git a/...or/libremidi/backends/keyboard/config.hpp → ...di/libremidi/backends/keyboard/config.hpp b/...or/libremidi/backends/keyboard/config.hpp → ...di/libremidi/backends/keyboard/config.hpp
diff --git a/...r/libremidi/backends/keyboard/midi_in.hpp → ...i/libremidi/backends/keyboard/midi_in.hpp b/...r/libremidi/backends/keyboard/midi_in.hpp → ...i/libremidi/backends/keyboard/midi_in.hpp
diff --git a/.../vendor/libremidi/backends/linux/alsa.hpp → libremidi/libremidi/backends/linux/alsa.hpp b/.../vendor/libremidi/backends/linux/alsa.hpp → libremidi/libremidi/backends/linux/alsa.hpp
diff --git a/...libremidi/backends/linux/dylib_loader.hpp → ...libremidi/backends/linux/dylib_loader.hpp b/...libremidi/backends/linux/dylib_loader.hpp → ...libremidi/backends/linux/dylib_loader.hpp
diff --git a/...ndor/libremidi/backends/linux/helpers.hpp → ...midi/libremidi/backends/linux/helpers.hpp b/...ndor/libremidi/backends/linux/helpers.hpp → ...midi/libremidi/backends/linux/helpers.hpp
diff --git a/...dor/libremidi/backends/linux/pipewire.hpp → ...idi/libremidi/backends/linux/pipewire.hpp b/...dor/libremidi/backends/linux/pipewire.hpp → ...idi/libremidi/backends/linux/pipewire.hpp
diff --git a/.../vendor/libremidi/backends/linux/udev.hpp → libremidi/libremidi/backends/linux/udev.hpp b/.../vendor/libremidi/backends/linux/udev.hpp → libremidi/libremidi/backends/linux/udev.hpp
diff --git a/.../vendor/libremidi/backends/net/config.hpp → libremidi/libremidi/backends/net/config.hpp b/.../vendor/libremidi/backends/net/config.hpp → libremidi/libremidi/backends/net/config.hpp
diff --git a/...vendor/libremidi/backends/net/helpers.hpp → libremidi/libremidi/backends/net/helpers.hpp b/...vendor/libremidi/backends/net/helpers.hpp → libremidi/libremidi/backends/net/helpers.hpp
diff --git a/...vendor/libremidi/backends/net/midi_in.hpp → libremidi/libremidi/backends/net/midi_in.hpp b/...vendor/libremidi/backends/net/midi_in.hpp → libremidi/libremidi/backends/net/midi_in.hpp
diff --git a/...endor/libremidi/backends/net/midi_out.hpp → ...emidi/libremidi/backends/net/midi_out.hpp b/...endor/libremidi/backends/net/midi_out.hpp → ...emidi/libremidi/backends/net/midi_out.hpp
diff --git a/...endor/libremidi/backends/net/observer.hpp → ...emidi/libremidi/backends/net/observer.hpp b/...endor/libremidi/backends/net/observer.hpp → ...emidi/libremidi/backends/net/observer.hpp
diff --git a/...idi/vendor/libremidi/backends/network.hpp → libremidi/libremidi/backends/network.hpp b/...idi/vendor/libremidi/backends/network.hpp → libremidi/libremidi/backends/network.hpp
diff --git a/...vendor/libremidi/backends/network_ump.hpp → libremidi/libremidi/backends/network_ump.hpp b/...vendor/libremidi/backends/network_ump.hpp → libremidi/libremidi/backends/network_ump.hpp
diff --git a/...di/vendor/libremidi/backends/pipewire.hpp → libremidi/libremidi/backends/pipewire.hpp b/...di/vendor/libremidi/backends/pipewire.hpp → libremidi/libremidi/backends/pipewire.hpp
diff --git a/...or/libremidi/backends/pipewire/config.hpp → ...di/libremidi/backends/pipewire/config.hpp b/...or/libremidi/backends/pipewire/config.hpp → ...di/libremidi/backends/pipewire/config.hpp
diff --git a/...r/libremidi/backends/pipewire/context.hpp → ...i/libremidi/backends/pipewire/context.hpp b/...r/libremidi/backends/pipewire/context.hpp → ...i/libremidi/backends/pipewire/context.hpp
diff --git a/...r/libremidi/backends/pipewire/helpers.hpp → ...i/libremidi/backends/pipewire/helpers.hpp b/...r/libremidi/backends/pipewire/helpers.hpp → ...i/libremidi/backends/pipewire/helpers.hpp
diff --git a/...r/libremidi/backends/pipewire/midi_in.hpp → ...i/libremidi/backends/pipewire/midi_in.hpp b/...r/libremidi/backends/pipewire/midi_in.hpp → ...i/libremidi/backends/pipewire/midi_in.hpp
diff --git a/.../libremidi/backends/pipewire/midi_out.hpp → .../libremidi/backends/pipewire/midi_out.hpp b/.../libremidi/backends/pipewire/midi_out.hpp → .../libremidi/backends/pipewire/midi_out.hpp
diff --git a/.../libremidi/backends/pipewire/observer.hpp → .../libremidi/backends/pipewire/observer.hpp b/.../libremidi/backends/pipewire/observer.hpp → .../libremidi/backends/pipewire/observer.hpp
diff --git a/...midi/backends/pipewire/shared_handler.hpp → ...midi/backends/pipewire/shared_handler.hpp b/...midi/backends/pipewire/shared_handler.hpp → ...midi/backends/pipewire/shared_handler.hpp
diff --git a/...idi/vendor/libremidi/backends/winmidi.hpp → libremidi/libremidi/backends/winmidi.hpp b/...idi/vendor/libremidi/backends/winmidi.hpp → libremidi/libremidi/backends/winmidi.hpp
diff --git a/...dor/libremidi/backends/winmidi/config.hpp → ...idi/libremidi/backends/winmidi/config.hpp b/...dor/libremidi/backends/winmidi/config.hpp → ...idi/libremidi/backends/winmidi/config.hpp
diff --git a/...or/libremidi/backends/winmidi/helpers.hpp → ...di/libremidi/backends/winmidi/helpers.hpp b/...or/libremidi/backends/winmidi/helpers.hpp → ...di/libremidi/backends/winmidi/helpers.hpp
diff --git a/...or/libremidi/backends/winmidi/midi_in.hpp → ...di/libremidi/backends/winmidi/midi_in.hpp b/...or/libremidi/backends/winmidi/midi_in.hpp → ...di/libremidi/backends/winmidi/midi_in.hpp
diff --git a/...r/libremidi/backends/winmidi/midi_out.hpp → ...i/libremidi/backends/winmidi/midi_out.hpp b/...r/libremidi/backends/winmidi/midi_out.hpp → ...i/libremidi/backends/winmidi/midi_out.hpp
diff --git a/...r/libremidi/backends/winmidi/observer.hpp → ...i/libremidi/backends/winmidi/observer.hpp b/...r/libremidi/backends/winmidi/observer.hpp → ...i/libremidi/backends/winmidi/observer.hpp
diff --git a/...emidi/vendor/libremidi/backends/winmm.hpp → libremidi/libremidi/backends/winmm.hpp b/...emidi/vendor/libremidi/backends/winmm.hpp → libremidi/libremidi/backends/winmm.hpp
diff --git a/...endor/libremidi/backends/winmm/config.hpp → ...emidi/libremidi/backends/winmm/config.hpp b/...endor/libremidi/backends/winmm/config.hpp → ...emidi/libremidi/backends/winmm/config.hpp
diff --git a/...libremidi/backends/winmm/error_domain.hpp → ...libremidi/backends/winmm/error_domain.hpp b/...libremidi/backends/winmm/error_domain.hpp → ...libremidi/backends/winmm/error_domain.hpp
diff --git a/...ndor/libremidi/backends/winmm/helpers.hpp → ...midi/libremidi/backends/winmm/helpers.hpp b/...ndor/libremidi/backends/winmm/helpers.hpp → ...midi/libremidi/backends/winmm/helpers.hpp
diff --git a/...ndor/libremidi/backends/winmm/midi_in.hpp → ...midi/libremidi/backends/winmm/midi_in.hpp b/...ndor/libremidi/backends/winmm/midi_in.hpp → ...midi/libremidi/backends/winmm/midi_in.hpp
diff --git a/...dor/libremidi/backends/winmm/midi_out.hpp → ...idi/libremidi/backends/winmm/midi_out.hpp b/...dor/libremidi/backends/winmm/midi_out.hpp → ...idi/libremidi/backends/winmm/midi_out.hpp
diff --git a/...dor/libremidi/backends/winmm/observer.hpp → ...idi/libremidi/backends/winmm/observer.hpp b/...dor/libremidi/backends/winmm/observer.hpp → ...idi/libremidi/backends/winmm/observer.hpp
diff --git a/...midi/vendor/libremidi/backends/winuwp.hpp → libremidi/libremidi/backends/winuwp.hpp b/...midi/vendor/libremidi/backends/winuwp.hpp → libremidi/libremidi/backends/winuwp.hpp
diff --git a/...ndor/libremidi/backends/winuwp/config.hpp → ...midi/libremidi/backends/winuwp/config.hpp b/...ndor/libremidi/backends/winuwp/config.hpp → ...midi/libremidi/backends/winuwp/config.hpp
diff --git a/...dor/libremidi/backends/winuwp/helpers.hpp → ...idi/libremidi/backends/winuwp/helpers.hpp b/...dor/libremidi/backends/winuwp/helpers.hpp → ...idi/libremidi/backends/winuwp/helpers.hpp
diff --git a/...dor/libremidi/backends/winuwp/midi_in.hpp → ...idi/libremidi/backends/winuwp/midi_in.hpp b/...dor/libremidi/backends/winuwp/midi_in.hpp → ...idi/libremidi/backends/winuwp/midi_in.hpp
diff --git a/...or/libremidi/backends/winuwp/midi_out.hpp → ...di/libremidi/backends/winuwp/midi_out.hpp b/...or/libremidi/backends/winuwp/midi_out.hpp → ...di/libremidi/backends/winuwp/midi_out.hpp
diff --git a/...or/libremidi/backends/winuwp/observer.hpp → ...di/libremidi/backends/winuwp/observer.hpp b/...or/libremidi/backends/winuwp/observer.hpp → ...di/libremidi/backends/winuwp/observer.hpp
diff --git a/libremidi/vendor/libremidi/client.cpp → libremidi/libremidi/client.cpp b/libremidi/vendor/libremidi/client.cpp → libremidi/libremidi/client.cpp
diff --git a/libremidi/vendor/libremidi/client.hpp → libremidi/libremidi/client.hpp b/libremidi/vendor/libremidi/client.hpp → libremidi/libremidi/client.hpp
diff --git a/libremidi/vendor/libremidi/cmidi2.hpp → libremidi/libremidi/cmidi2.hpp b/libremidi/vendor/libremidi/cmidi2.hpp → libremidi/libremidi/cmidi2.hpp
diff --git a/libremidi/vendor/libremidi/config.hpp → libremidi/libremidi/config.hpp b/libremidi/vendor/libremidi/config.hpp → libremidi/libremidi/config.hpp
diff --git a/...emidi/vendor/libremidi/configurations.hpp → libremidi/libremidi/configurations.hpp b/...emidi/vendor/libremidi/configurations.hpp → libremidi/libremidi/configurations.hpp
diff --git a/libremidi/vendor/libremidi/defaults.hpp → libremidi/libremidi/defaults.hpp b/libremidi/vendor/libremidi/defaults.hpp → libremidi/libremidi/defaults.hpp
diff --git a/...di/vendor/libremidi/detail/conversion.hpp → libremidi/libremidi/detail/conversion.hpp b/...di/vendor/libremidi/detail/conversion.hpp → libremidi/libremidi/detail/conversion.hpp
diff --git a/libremidi/vendor/libremidi/detail/memory.hpp → libremidi/libremidi/detail/memory.hpp b/libremidi/vendor/libremidi/detail/memory.hpp → libremidi/libremidi/detail/memory.hpp
diff --git a/...midi/vendor/libremidi/detail/midi_api.hpp → libremidi/libremidi/detail/midi_api.hpp b/...midi/vendor/libremidi/detail/midi_api.hpp → libremidi/libremidi/detail/midi_api.hpp
diff --git a/...emidi/vendor/libremidi/detail/midi_in.hpp → libremidi/libremidi/detail/midi_in.hpp b/...emidi/vendor/libremidi/detail/midi_in.hpp → libremidi/libremidi/detail/midi_in.hpp
diff --git a/...midi/vendor/libremidi/detail/midi_out.hpp → libremidi/libremidi/detail/midi_out.hpp b/...midi/vendor/libremidi/detail/midi_out.hpp → libremidi/libremidi/detail/midi_out.hpp
diff --git a/.../libremidi/detail/midi_stream_decoder.hpp → .../libremidi/detail/midi_stream_decoder.hpp b/.../libremidi/detail/midi_stream_decoder.hpp → .../libremidi/detail/midi_stream_decoder.hpp
diff --git a/...midi/vendor/libremidi/detail/observer.hpp → libremidi/libremidi/detail/observer.hpp b/...midi/vendor/libremidi/detail/observer.hpp → libremidi/libremidi/detail/observer.hpp
diff --git a/...idi/vendor/libremidi/detail/semaphore.hpp → libremidi/libremidi/detail/semaphore.hpp b/...idi/vendor/libremidi/detail/semaphore.hpp → libremidi/libremidi/detail/semaphore.hpp
diff --git a/...di/vendor/libremidi/detail/ump_stream.hpp → libremidi/libremidi/detail/ump_stream.hpp b/...di/vendor/libremidi/detail/ump_stream.hpp → libremidi/libremidi/detail/ump_stream.hpp
diff --git a/libremidi/vendor/libremidi/error.hpp → libremidi/libremidi/error.hpp b/libremidi/vendor/libremidi/error.hpp → libremidi/libremidi/error.hpp
diff --git a/libremidi/vendor/libremidi/error_handler.hpp → libremidi/libremidi/error_handler.hpp b/libremidi/vendor/libremidi/error_handler.hpp → libremidi/libremidi/error_handler.hpp
diff --git a/.../vendor/libremidi/input_configuration.hpp → libremidi/libremidi/input_configuration.hpp b/.../vendor/libremidi/input_configuration.hpp → libremidi/libremidi/input_configuration.hpp
diff --git a/libremidi/vendor/libremidi/libremidi-c.cpp → libremidi/libremidi/libremidi-c.cpp b/libremidi/vendor/libremidi/libremidi-c.cpp → libremidi/libremidi/libremidi-c.cpp
diff --git a/libremidi/vendor/libremidi/libremidi-c.h → libremidi/libremidi/libremidi-c.h b/libremidi/vendor/libremidi/libremidi-c.h → libremidi/libremidi/libremidi-c.h
diff --git a/libremidi/vendor/libremidi/libremidi.cpp → libremidi/libremidi/libremidi.cpp b/libremidi/vendor/libremidi/libremidi.cpp → libremidi/libremidi/libremidi.cpp
diff --git a/libremidi/vendor/libremidi/libremidi.hpp → libremidi/libremidi/libremidi.hpp b/libremidi/vendor/libremidi/libremidi.hpp → libremidi/libremidi/libremidi.hpp
diff --git a/libremidi/vendor/libremidi/message.hpp → libremidi/libremidi/message.hpp b/libremidi/vendor/libremidi/message.hpp → libremidi/libremidi/message.hpp
diff --git a/libremidi/vendor/libremidi/midi_in.cpp → libremidi/libremidi/midi_in.cpp b/libremidi/vendor/libremidi/midi_in.cpp → libremidi/libremidi/midi_in.cpp
diff --git a/libremidi/vendor/libremidi/midi_out.cpp → libremidi/libremidi/midi_out.cpp b/libremidi/vendor/libremidi/midi_out.cpp → libremidi/libremidi/midi_out.cpp
diff --git a/libremidi/vendor/libremidi/observer.cpp → libremidi/libremidi/observer.cpp b/libremidi/vendor/libremidi/observer.cpp → libremidi/libremidi/observer.cpp
diff --git a/...ndor/libremidi/observer_configuration.hpp → ...midi/libremidi/observer_configuration.hpp b/...ndor/libremidi/observer_configuration.hpp → ...midi/libremidi/observer_configuration.hpp
diff --git a/...vendor/libremidi/output_configuration.hpp → libremidi/libremidi/output_configuration.hpp b/...vendor/libremidi/output_configuration.hpp → libremidi/libremidi/output_configuration.hpp
diff --git a/libremidi/vendor/libremidi/reader.cpp → libremidi/libremidi/reader.cpp b/libremidi/vendor/libremidi/reader.cpp → libremidi/libremidi/reader.cpp
diff --git a/libremidi/vendor/libremidi/reader.hpp → libremidi/libremidi/reader.hpp b/libremidi/vendor/libremidi/reader.hpp → libremidi/libremidi/reader.hpp
diff --git a/...emidi/vendor/libremidi/shared_context.hpp → libremidi/libremidi/shared_context.hpp b/...emidi/vendor/libremidi/shared_context.hpp → libremidi/libremidi/shared_context.hpp
diff --git a/libremidi/vendor/libremidi/system_error2.hpp → libremidi/libremidi/system_error2.hpp b/libremidi/vendor/libremidi/system_error2.hpp → libremidi/libremidi/system_error2.hpp
diff --git a/libremidi/vendor/libremidi/ump.hpp → libremidi/libremidi/ump.hpp b/libremidi/vendor/libremidi/ump.hpp → libremidi/libremidi/ump.hpp
diff --git a/libremidi/vendor/libremidi/writer.cpp → libremidi/libremidi/writer.cpp b/libremidi/vendor/libremidi/writer.cpp → libremidi/libremidi/writer.cpp
diff --git a/libremidi/vendor/libremidi/writer.hpp → libremidi/libremidi/writer.hpp b/libremidi/vendor/libremidi/writer.hpp → libremidi/libremidi/writer.hpp
diff --git a/libremidi/package.yaml b/libremidi/package.yaml
@@ -1,5 +1,5 @@
 name: libremidi
-version: 0.1.1
+version: 0.2.0
 
 github: ejconlon/libremidi-haskell
 license: BSD3
@@ -22,25 +22,27 @@ dependencies:
 - text >= 2.0.2 && < 2.2
 - transformers >= 0.6.1 && < 0.7
 
+# Tired of fighting with cabal so I'm just spilling C includes
+# into the package root...
 install-includes:
-- vendor/libremidi/libremidi-c.h
+- libremidi/libremidi-c.h
 
 library:
   source-dirs: src
   extra-libraries:
   - stdc++
   include-dirs:
-  - vendor
+  - .
   cxx-sources:
-  - vendor/libremidi/*.cpp
+  - libremidi/*.cpp
   when:
   - condition: os(darwin)
     cxx-options: -std=c++20 -DLIBREMIDI_COREMIDI=1
     frameworks: CoreMIDI CoreAudio CoreFoundation
-    #   -- NOTE(ejconlon) This is to make the c ffi wrapper actually catch
-    #   -- the c++ exceptions instead of simply aborting.
-    #   -- Cribbed from https://github.com/fpco/inline-c/pull/89
-    #   -- avoid https://gitlab.haskell.org/ghc/ghc/issues/11829
+    # NOTE(ejconlon) This is to make the c ffi wrapper actually catch
+    # the c++ exceptions instead of simply aborting.
+    # Cribbed from https://github.com/fpco/inline-c/pull/89
+    # avoid https://gitlab.haskell.org/ghc/ghc/issues/11829
     ld-options: -Wl,-keep_dwarf_unwind
     ghc-options: -pgmcxx=clang++
   - condition: os(linux)

diff --git a/libremidi/vendor/readerwriterqueue.h → libremidi/readerwriterqueue.h b/libremidi/vendor/readerwriterqueue.h → libremidi/readerwriterqueue.h