Added support for midi messages

Author: jwarwick

lib/osc/message.ex

@@ -117,6 +117,10 @@ defmodule OSC.Message do
     {{:osc_rgba, [red: r, green: g, blue: b, alpha: a]}, rest}
   end
 
+  defp get_next_value(?m, <<port, status, data1, data2, rest::binary>>) do
+    {{:osc_midi, [port_id: port, status: status, data1: data1, data2: data2]}, rest}
+  end
+
   @doc """
   Construct an OSC message
   """
@@ -176,6 +180,10 @@ defmodule OSC.Message do
       value_or_zero(colors[:blue]), value_or_zero(colors[:alpha])>>}
   end
 
+  defp construct_args({:osc_midi, values}, {tags, args}) do
+    {tags <> <<?m>>, args <> <<values[:port_id], values[:status], values[:data1], values[:data2]>>}
+  end
+
   defp value_or_zero(nil), do: 0
   defp value_or_zero(value), do: value
 end

test/osc/message_test.exs

@@ -98,6 +98,14 @@ defmodule OSC.MessageTest do
     assert {"/ab", [{:osc_rgba, [red: 0x01, green: 0x02, blue: 0x03, alpha: 0x04]}, {:osc_integer, 1000}]} = OSC.Message.parse(msg)
   end
 
+  test "parses a midi message" do
+    msg = <<"/ab", 0, ",m", 0, 0, 0x01020304::size(32)>>
+    assert {"/ab", [{:osc_midi, [port_id: 0x01, status: 0x02, data1: 0x03, data2: 0x04]}]} = OSC.Message.parse(msg)
+
+    msg = <<"/ab", 0, ",mi", 0, 0x01020304::size(32), 1000 :: [signed, big, size(32)]>>
+    assert {"/ab", [{:osc_midi, [port_id: 0x01, status: 0x02, data1: 0x03, data2: 0x04]}, {:osc_integer, 1000}]} = OSC.Message.parse(msg)
+  end
+
   test "construct a simple message" do
     assert <<"/ab", 0, ",", 0, 0, 0>> = OSC.Message.construct("/ab", [])
 
@@ -156,5 +164,10 @@ defmodule OSC.MessageTest do
     assert <<"/ab", 0, ",r", 0, 0, 0x00000000::size(32)>> = 
     OSC.Message.construct("/ab", [{:osc_rgba, []}])
   end
+
+  test "construct a midi message" do
+    assert <<"/ab", 0, ",m", 0, 0, 0x01020304::size(32)>> = 
+    OSC.Message.construct("/ab", [{:osc_midi, [port_id: 0x01, status: 0x02, data1: 0x03, data2: 0x04]}])
+  end
 end