SuperSonic - update with new MIDI functionality

This means sp_midi is now deprecated

Author: samaaron

app/external/supersonic

@@ -641,7 +641,14 @@ void MetricsPanel::drainEgressRing(bool nrt)
     const QString cMuted = m_theme ? m_theme->color("CommentForeground").name() : kindColor(K_Muted).name();
     walkRing(rv, cur, m_scratch,
         [&](uint32_t seq, uint32_t src, const uint8_t* payload, uint32_t n) {
-            oscpkt::PacketReader pr(payload, n);
+            // NRT-out frames carry a leading [route:u32] word (OUT too once
+            // unified). OSC addresses start with '/', a route word doesn't, so
+            // skip 4 bytes when the first byte isn't '/'.
+            const uint8_t* osc  = payload;
+            uint32_t       oscN = n;
+            if (n >= 4 && payload[0] != '/') { osc += 4; oscN -= 4; }
+
+            oscpkt::PacketReader pr(osc, oscN);
             oscpkt::Message* msg = pr.isOk() ? pr.popMessage() : nullptr;
             if (msg && msg->addressPattern() == "/supersonic/debug") {
                 oscpkt::Message::ArgReader ar = msg->arg();
@@ -658,7 +665,7 @@ void MetricsPanel::drainEgressRing(bool nrt)
                 }
             }
             if (m_oscInView)
-                m_oscInView->append(formatOscHtml(payload, n, seq, src, /*outgoing=*/false));
+                m_oscInView->append(formatOscHtml(osc, oscN, seq, src, /*outgoing=*/false));
         });
 }
 

app/gui/widgets/metricspanel.cpp

@@ -17,14 +17,5 @@ include(ExternalProject)
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET '10.15')
 
-# sp_midi
-ExternalProject_Add(sp_midi
-    PREFIX sp_midi-prefix
-    SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../external/sp_midi
-    INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/priv
-    CMAKE_ARGS
-        -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/priv
-        -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
-        -DUSE_SYSTEM_RTMIDI=${USE_SYSTEM_LIBS}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release
-    )
+# MIDI moved to SuperSonic (Rust/midir; see app/server/ruby midi_api.rb): the
+# sp_midi NIF has been removed and there are no external NIFs left to build here.

app/server/beam/tau/CMakeLists.txt

@@ -55,8 +55,6 @@ config :logger, :tau_file_log,
 
 if config_env() != :test do
   config :tau,
-    midi_on: extract_env.("TAU_MIDI_ON", :bool, false),
-    midi_enabled: extract_env.("TAU_MIDI_ENABLED", :bool, false),
     cues_on: extract_env.("TAU_CUES_ON", :bool, false),
     osc_in_udp_loopback_restricted:
       extract_env.("TAU_OSC_IN_UDP_LOOPBACK_RESTRICTED", :bool, true),
@@ -68,8 +66,6 @@ if config_env() != :test do
     daemon_host: {127, 0, 0, 1}
 else
   config :tau,
-    midi_on: extract_env.("TAU_MIDI_ON", :bool, false),
-    midi_enabled: extract_env.("TAU_MIDI_ENABLED", :bool, false),
     cues_on: extract_env.("TAU_CUES_ON", :bool, true),
     osc_in_udp_loopback_restricted:
       extract_env.("TAU_OSC_IN_UDP_LOOPBACK_RESTRICTED", :bool, true),

app/server/beam/tau/config/runtime.exs

@@ -10,14 +10,7 @@ defmodule Tau.Application do
   def start(_type, _args) do
     Logger.info("All systems booting....")
 
-    midi_enabled = Application.get_env(:tau, :midi_enabled, false)
-
-    if midi_enabled do
-      Logger.info("Initialising MIDI native interface")
-      :sp_midi.init()
-    else
-      Logger.info("Starting without MIDI native interface")
-    end
+    # MIDI moved to SuperSonic (Rust/midir); the sp_midi NIF has been removed.
 
     children = [
       :tau_server_sup

app/server/beam/tau/lib/tau/application.ex

@@ -14,10 +14,10 @@
 
 -module(tau_server_api).
 
--export([start_link/2]).
+-export([start_link/1]).
 
 %% internal
--export([init/3, loop/1]).
+-export([init/2, loop/1]).
 
 %% sys module callbacks
 -export([system_continue/3, system_terminate/4, system_code_change/4,
@@ -66,12 +66,12 @@
 
 
 %% supervisor compliant start function
-start_link(CueServer, MIDIServer) ->
+start_link(CueServer) ->
     %% synchronous start of the child process
-    proc_lib:start_link(?MODULE, init, [self(), CueServer, MIDIServer]).
+    proc_lib:start_link(?MODULE, init, [self(), CueServer]).
 
 
-init(Parent, CueServer, MIDIServer) ->
+init(Parent, CueServer) ->
     register(?SERVER, self()),
     APIPort = application:get_env(?APPLICATION, api_port, undefined),
     DaemonToken = application:get_env(?APPLICATION, daemon_token, undefined),
@@ -104,7 +104,6 @@ init(Parent, CueServer, MIDIServer) ->
               daemon_host => DaemonHost,
               api_socket => APISocket,
               cue_server => CueServer,
-              midi_server => MIDIServer,
               tag_map => #{}
              },
     send_to_cue({tau_ready}, State),
@@ -155,18 +154,6 @@ loop(State) ->
             ok = gen_udp:send(APISocket, DaemonHost, DaemonPort, PidBin),
             ?MODULE:loop(State);
 
-        {cmd, ["/midi", OSC]=Cmd} ->
-            debug_cmd(Cmd),
-            MIDIServer = maps:get(midi_server, State),
-            MIDIServer ! {send_midi, OSC},
-            ?MODULE:loop(State);
-
-        {cmd, ["/midi-flush"]=Cmd} ->
-            debug_cmd(Cmd),
-            MIDIServer = maps:get(midi_server, State),
-            MIDIServer ! {flush},
-            ?MODULE:loop(State);
-
         {cmd, ["/flush", Tag]=Cmd} ->
             debug_cmd(Cmd),
             {Tracker, NewState} = tracker_pid(Tag, State),
@@ -183,11 +170,6 @@ loop(State) ->
             send_to_cue({cues_on, Flag}, State),
             ?MODULE:loop(State);
 
-        {cmd, ["/stop-start-midi-cues", Flag]=Cmd} ->
-            debug_cmd(Cmd),
-            send_to_cue({midi_on, Flag}, State),
-            ?MODULE:loop(State);
-
         {cmd, Cmd} ->
             logger:error("Unknown OSC command:: ~p", [Cmd]),
             ?MODULE:loop(State);
@@ -218,10 +200,6 @@ do_bundle(Time, Args, State) ->
                 schedule_cmd(Time, "default", State, {send_osc, Host, Port, OSC});
             ["/send-after-tagged", Tag, Host, Port, OSC] ->
                 schedule_cmd(Time, Tag, State, {send_osc, Host, Port, OSC});
-            ["/midi-at", MIDI] ->
-                schedule_midi(Time, "default", State, {send_midi, MIDI});
-            ["/midi-at-tagged", Tag, MIDI] ->
-                schedule_midi(Time, Tag, State, {send_midi, MIDI});
             Other ->
                 logger:error("Unexpected bundle content:~p", Other),
                 State
@@ -247,10 +225,6 @@ schedule_internal_call(Time, Tag, State, Server, Msg) ->
     NewState.
 
 
-schedule_midi(Time, Tag, State, Msg) ->
-    MIDIServer = maps:get(midi_server, State),
-    schedule_internal_call(Time, Tag, State, MIDIServer, Msg).
-
 schedule_cmd(Time, Tag, State, Msg) ->
     CueServer = maps:get(cue_server, State),
     schedule_internal_call(Time, Tag, State, CueServer, Msg).

app/server/beam/tau/src/sp_midi/sp_midi.erl

@@ -40,7 +40,6 @@ init(Parent) ->
     register(?SERVER, self()),
     OSCInUDPLoopbackRestricted = application:get_env(?APPLICATION, osc_in_udp_loopback_restricted, true),
     CuesOn                     = application:get_env(?APPLICATION, cues_on,                        true),
-    MIDIOn                     = application:get_env(?APPLICATION, midi_on,                        true),
     OSCInUDPPort               = application:get_env(?APPLICATION, osc_in_udp_port,                undefined),
     CuePort                    = application:get_env(?APPLICATION, spider_port,                    undefined),
     CueHost                    = {127,0,0,1},
@@ -71,7 +70,6 @@ init(Parent) ->
           [try erlang:port_info(InSocket) catch _:_ -> undefined end]),
     State = #{parent => Parent,
               cues_on => CuesOn,
-              midi_on => MIDIOn,
               cue_host => CueHost,
               cue_port => CuePort,
               osc_in_udp_loopback_restricted => OSCInUDPLoopbackRestricted,
@@ -83,31 +81,10 @@ init(Parent) ->
 
 loop(State) ->
     receive
-        {midi_in, Path, Args} ->
-            case State of
-                #{midi_on := true} ->
-                    CueHost = maps:get(cue_host, State),
-                    CuePort = maps:get(cue_port, State),
-                    InSocket = maps:get(in_socket, State),
-                    forward_internal_cue(CueHost, CuePort, InSocket, Path, Args),
-                    ?MODULE:loop(State);
-                #{midi_on := false} ->
-                    logger:debug("MIDI cue forwarding disabled - ignored: ~p", [{Path, Args}]),
-                    ?MODULE:loop(State)
-            end;
-
         {api_reply, UUID, Response} ->
             send_api_reply(State, UUID, Response),
             ?MODULE:loop(State);
 
-        {update_midi_ports, Ins, Outs} ->
-            CueHost = maps:get(cue_host, State),
-            CuePort = maps:get(cue_port, State),
-            InSocket = maps:get(in_socket, State),
-            update_midi_in_ports(CueHost, CuePort, InSocket, Ins),
-            update_midi_out_ports(CueHost, CuePort, InSocket, Outs),
-            ?MODULE:loop(State);
-
         {udp, InSocket, Ip, Port, Bin} ->
             logger:debug("cue server got UDP on ~p:~p", [Ip, Port]),
             try osc:decode(Bin) of
@@ -167,14 +144,6 @@ loop(State) ->
             logger:info("Disabling cue forwarding "),
             ?MODULE:loop(State#{cues_on := false});
 
-        {midi_on, true} ->
-            logger:info("Enabling midi cue forwarding "),
-            ?MODULE:loop(State#{midi_on := true});
-
-        {midi_on, false} ->
-            logger:info("Disabling midi cue forwarding "),
-            ?MODULE:loop(State#{midi_on := false});
-
         {send_osc, Host, Port, OSC} ->
             send_udp(maps:get(in_socket, State), Host, Port, OSC),
             ?MODULE:loop(State);
@@ -240,18 +209,6 @@ send_udp(Socket, Host, Port, Bin)
 	Error -> logger:error("Unable to send UDP - bad socket (~p): ~p", [Error, Host])
     end.
 
-update_midi_in_ports(CueHost, CuePort, InSocket, Args) ->
-    Bin = osc:encode(["/midi-ins", "erlang" | Args]),
-    send_udp(InSocket, CueHost, CuePort, Bin),
-    logger:debug("forwarded new MIDI ins to ~p:~p", [CueHost, CuePort]),
-    ok.
-
-update_midi_out_ports(CueHost, CuePort, InSocket, Args) ->
-    Bin = osc:encode(["/midi-outs", "erlang" | Args]),
-    send_udp(InSocket, CueHost, CuePort, Bin),
-    logger:debug("forwarded new MIDI outs to ~p:~p", [CueHost, CuePort]),
-    ok.
-
 send_api_reply(State, UUID, Args) ->
     CueHost = maps:get(cue_host, State),
     CuePort = maps:get(cue_port, State),
@@ -261,12 +218,6 @@ send_api_reply(State, UUID, Args) ->
     send_udp(InSocket, CueHost, CuePort, Bin),
     ok.
 
-forward_internal_cue(CueHost, CuePort, InSocket, Path, Args) ->
-    Bin = osc:encode(["/internal-cue", "erlang", Path | Args]),
-    send_udp(InSocket, CueHost, CuePort, Bin),
-    logger:debug("forwarded internal OSC cue to ~p:~p", [CueHost, CuePort]),
-    ok.
-
 forward_cue(CueHost, CuePort, InSocket, Ip, Port, Cmd) ->
     Bin = osc:encode(["/external-osc-cue", inet:ntoa(Ip), Port] ++ Cmd),
     send_udp(InSocket, CueHost, CuePort, Bin),