unmidinette of portmidi, with a new Midinette.Platform.PortMidi project

Author: smoothdeveloper

Midinette.sln

@@ -9,6 +9,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Midinette.Elektron", "src\M
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Midinette.Fable", "src\Midinette.Fable\src\Midinette.Fable.fsproj", "{7478DC1B-308E-4921-9654-77DC9B4A61F4}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Midinette.Platform.PortMidi", "src\Midinette.Platform.PortMidi\Midinette.Platform.PortMidi.fsproj", "{B7D84F4A-6664-4D07-8689-317CABE09A2F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,10 @@ Global
 		{7478DC1B-308E-4921-9654-77DC9B4A61F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7478DC1B-308E-4921-9654-77DC9B4A61F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7478DC1B-308E-4921-9654-77DC9B4A61F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7D84F4A-6664-4D07-8689-317CABE09A2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7D84F4A-6664-4D07-8689-317CABE09A2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7D84F4A-6664-4D07-8689-317CABE09A2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7D84F4A-6664-4D07-8689-317CABE09A2F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

paket.dependencies

@@ -1,4 +1,6 @@
 source https://nuget.org/api/v2
+source ../portmidisharp/build/Debug/AnyCPU
+
 storage: none
 redirects: force
 generate_load_scripts: on
@@ -9,7 +11,7 @@ nuget Fable.Core
 nuget Fable.Import.Browser
 nuget Fable.Import.WebMIDI
 nuget FSharp.Core = 4.2.3
-
+nuget PortMidiSharp
 group Build
   source https://nuget.org/api/v2
   framework >= net461

paket.lock

@@ -7,6 +7,7 @@ open System.Threading
 open System
 open System.Diagnostics
 open Midi
+open Midinette.Platform
 
 [<RequireQualifiedAccess>]
 type LFOType =
@@ -975,13 +976,14 @@ type MidiOutputData =
 | Message of MidiMessage
 | Sysex of bytes: byte array
 
-type MachineDrum(inPort: IMidiInput<int>, outPort: IMidiOutput<int>, getSysexNowTimestamp: unit -> int) =
+type MachineDrum<'timestamp,'midievent>(inPort: IMidiInput<'midievent>, outPort: IMidiOutput<'timestamp, _>, getSysexNowTimestamp) =
   let helpGetMDSysex maxMessage (timeout: TimeSpan) (request: MachineDrumSysexRequests) inPort : Async<MachineDrumSysexResponses option> =
   #if FABLE_COMPILER
     failwithf "TODO FABLE"
   #else
     let getSysexAsync =
-      Midi.Sysex.helpGetSysex
+      
+      Midinette.Sysex.Sysex.helpGetSysex
           maxMessage
           timeout 
           (fun sysex -> 
@@ -1066,10 +1068,11 @@ type MachineDrum(inPort: IMidiInput<int>, outPort: IMidiOutput<int>, getSysexNow
       | Some globals -> 
           let now = getNow ()
           for timestamp, mdEvent in mdEvents do
+              let timestamp = timestamp // + now /// TDODODODODODO??
               x.EventToMidiMessages mdEvent globals 
               |> Array.iter (
                 function
-                | MidiOutputData.Message message -> outPort.WriteMessage (timestamp + now) message
+                | MidiOutputData.Message message -> outPort.WriteMessage timestamp message
                 | MidiOutputData.Sysex sysex     -> outPort.WriteSysex now sysex
               )
       | None -> ()
@@ -1133,12 +1136,12 @@ module MachineDrumEventParser =
     elif cc <= 95uy  then 2uy
     else                  3uy
 
-type TimestampedMessage<'t> = { 
-  Timestamp : int
+type TimestampedMessage<'t,'timestamp> = { 
+  Timestamp : 'timestamp
   Message: 't
 }
 
-type MachineDrumEventListener(md: MachineDrum, getNow : unit -> int) =
+type MachineDrumEventListener(md: MachineDrum<_,_>, getNow) =
   let mutable mdGlobalSettings = md.CurrentGlobalSettings
   let midiIn = md.MidiOutPort
   //let mutable lastKit = {Timestamp = 0; Message = None }
@@ -1247,7 +1250,7 @@ type MachineDrumEventListener(md: MachineDrum, getNow : unit -> int) =
 
   [<CLIEvent>] member x.Event = event.Publish
 
-let mdDetection getTimestamp inputs outputs onSysex withMachineDrum  =
+let mdDetection (getTimestamp) (inputs: IMidiInput<_> array) (outputs: IMidiOutput<_,_> array) onSysex withMachineDrum  =
     let queryMessage = QueryStatus(GlobalSlot)
     let onSysex =
         match onSysex with 
@@ -1258,17 +1261,18 @@ let mdDetection getTimestamp inputs outputs onSysex withMachineDrum  =
             | Some(MachineDrumSysexResponses.GlobalSettingsResponse globals) -> true
             | _ -> false        
         )
+
+    Midinette.Sysex.Sysex.deviceInquiry inputs outputs 
+      onSysex
+      (fun midiOut ->
+        midiOut.WriteSysex (getTimestamp()) (QueryStatus(GlobalSlot).Sysex)
+      )
+      (fun midiIn midiOut ->
+          let md = MachineDrum(midiIn, midiOut, getTimestamp)
+          withMachineDrum md
+          { new System.IDisposable with member x.Dispose () = () }
+      )
 
-    Sysex.deviceInquiry inputs outputs
-        onSysex
-        (fun midiOut ->
-            midiOut.WriteSysex 0 (QueryStatus(GlobalSlot).Sysex)
-        )
-        (fun midiIn midiOut ->
-            let md = MachineDrum(midiIn, midiOut, getTimestamp)
-            withMachineDrum md
-            { new System.IDisposable with member x.Dispose () = () }
-        )
 
 
 

src/Midinette.Elektron/Elektron.MachineDrum.fs

@@ -2,6 +2,7 @@ module Elektron.MonoMachine
 
 open System
 open Midi
+open Midinette.Platform
 open Elektron.Platform
 open Elektron.Platform.SilverMachines
 type midi7 = byte
@@ -314,13 +315,13 @@ type MonoMachineTrig =
 | LFO    = 0b0100uy
 
 
-type MonoMachine(inPort: IMidiInput<_>, outPort: IMidiOutput<_>) =
+type MonoMachine<'timestamp,'midievent>(inPort: IMidiInput<'midievent>, outPort: IMidiOutput<'timestamp,_>, nowTimestamp) =
   let helpGetMonomachineSysex maxMessage (timeout: TimeSpan) (request: MonoMachineSysexRequests) (inPort: IMidiInput<_>) =
 #if FABLE_COMPILER
     failwithf "TODO FABLE"
 #else
     let getSysexAsync =
-      Midi.Sysex.helpGetSysex 
+      Midinette.Sysex.Sysex.helpGetSysex 
           maxMessage 
           timeout 
           (fun sysex -> 
@@ -347,24 +348,24 @@ type MonoMachine(inPort: IMidiInput<_>, outPort: IMidiOutput<_>) =
       let task = 
         helpGetMonomachineSysex 5 (TimeSpan.FromMilliseconds(5000.)) requestMessage inPort
         |> Async.StartAsTask
-      requestMessage.Sysex |> outPort.WriteSysex 0
+      requestMessage.Sysex |> outPort.WriteSysex (nowTimestamp ())
       task.Result
     | None ->
-      requestMessage.Sysex |> outPort.WriteSysex 0
+      requestMessage.Sysex |> outPort.WriteSysex (nowTimestamp ())
       None
 
   member x.MidiOutPort = inPort
   member x.MidiInPort = outPort
 
   member x.ChangeLevel track level =
     Midi.Nrpn.makeNRPN2 (00uy + track) 127uy level
-    |> outPort.WriteMessages 0
+    |> outPort.WriteMessages (nowTimestamp ())
   member x.ChangePitch track pitch =
     Midi.Nrpn.makeNRPN1 (112uy + track) pitch
-    |> outPort.WriteMessages 0
+    |> outPort.WriteMessages (nowTimestamp ())
   member x.SendTrigs track (trigs: MonoMachineTrig) =
     Midi.Nrpn.makeNRPN1 127uy ((track <<< 4) + (byte trigs))
-    |> outPort.WriteMessages 0
+    |> outPort.WriteMessages (nowTimestamp ())
   member x.DumpGlobal id =
     performSysExRequest (DumpGlobalSettings id)
   member x.DumpKit kit = 
@@ -374,7 +375,7 @@ type MonoMachine(inPort: IMidiInput<_>, outPort: IMidiOutput<_>) =
   member x.QueryStatus statusType =
     performSysExRequest (QueryStatus statusType)
   member x.AssignMachine track machine parameterAssignMode =
-    (AssignMachine (track, machine, parameterAssignMode)).Sysex |> outPort.WriteSysex 0
+    (AssignMachine (track, machine, parameterAssignMode)).Sysex |> outPort.WriteSysex (nowTimestamp ())
 
   member x.Dump dumpRequest =
     performSysExRequest dumpRequest
@@ -637,7 +638,7 @@ type TimestampedMessage<'t> = {
 }
 
 open Midi.MessageMatching
-type MonoMachineEventListener(getNow: unit -> int, mm: MonoMachine) =
+type MonoMachineEventListener(getNow: unit -> int, mm: MonoMachine<_,_>) =
   let settings = mm.CurrentGlobalSettings
   //let settings = { GlobalSettings.midiBaseChannel = 0uy }
   let midiIn = mm.MidiOutPort
@@ -659,7 +660,7 @@ type MonoMachineEventListener(getNow: unit -> int, mm: MonoMachine) =
     |> Array.map (fun t -> t, Midi.Registers.MidiChannelState<_>())
     |> dict
 
-  let makeMessage timestamp m = { Timestamp = timestamp; Message = m}
+  //let makeMessage timestamp m = { Timestamp = timestamp; Message = m}
 
   let onChannelMessage (midiEvent: MidiEvent<_>) =
     match settings with
@@ -708,7 +709,7 @@ type MonoMachineEventListener(getNow: unit -> int, mm: MonoMachine) =
   let onSysexMessage sysex =
     Sysex sysex
 
-  let realtimeListener = midiIn.RealtimeMessageReceived.Subscribe(fun m ->
+  let realtimeListener = midiIn.RealtimeMessageReceived.Subscribe(fun (m: MidiEvent<_>) ->
     let oldStarted = midiRealtimeState.started 
     midiRealtimeState.UpdateWithEvent m.Message
     if oldStarted <> midiRealtimeState.started then

src/Midinette.Elektron/Elektron.MonoMachine.fs

@@ -1,10 +1,11 @@
 module Midinette.Fable
 open Midi
+open Midinette.Platform
 module WM = Fable.Import.WebMIDI
 
 type DeviceInfo(port: WM.IMIDIPort) =
   member x.Port = port
-  interface Midi.IDeviceInfo with
+  interface IDeviceInfo with
     member x.DeviceId = port.Id |> int
     member x.Name = sprintf "id:%20A name:%20A manufacturer:%A" port.Id port.Name.Value port.Manufacturer
 
@@ -32,13 +33,13 @@ type WebMIDIInputPortWrapper(webMidiInput: WM.IMIDIInput, onStateChange, onMidiI
   let realtimeMessageReceived = new Event<_>()
 
   do
-    let midiIn = this :> Midi.IMidiInput<double>
+    let midiIn = this :> IMidiInput<MidiEvent<double>>
 
     webMidiInput.set_OnMidiMessage (fun mm ->
       let midiMessage = Midi.MidiMessage.Encode mm.Data.[0] mm.Data.[1] mm.Data.[2]
 
       if midiMessage.IsChannelMessage then
-        channelMessageReceived.Trigger(MidiEvent(midiMessage, mm.ReceivedTime))
+        channelMessageReceived.Trigger(MidiEvent<_>(midiMessage, mm.ReceivedTime))
       match onMidiIn with
       | Some onMidiIn -> onMidiIn mm
       | _ -> ()
@@ -50,7 +51,7 @@ type WebMIDIInputPortWrapper(webMidiInput: WM.IMIDIInput, onStateChange, onMidiI
       | _ -> ()
     )
 
-  interface Midi.IMidiInput<double> with
+  interface IMidiInput<MidiEvent<double>> with
     member x.DeviceInfo = DeviceInfo(webMidiInput) :> _
     member x.Close () = webMidiInput.Close () |> ignore
     member x.Open bufferSize = webMidiInput.Open() |> ignore
@@ -63,35 +64,21 @@ type WebMIDIInputPortWrapper(webMidiInput: WM.IMIDIInput, onStateChange, onMidiI
 
 type WebMIDIOutputPortWrapper(webMidiOutput: WM.IMIDIOutput, device, onStateChange) as this =
     do
-        let midiOut = this :> Midi.IMidiOutput<double>
+        let midiOut = this :> IMidiOutput<double, MidiMessage>
 
         webMidiOutput.set_OnStateChange (fun sc ->
             match onStateChange with
             | Some onStateChange -> onStateChange sc
             | _ -> ()
         )
 
-    interface IMidiOutput<double> with
+    interface IMidiOutput<double, MidiMessage> with
         member x.Open bufferSize latency = ()
         member x.Close () = ()
         member x.WriteMessage timestamp message =
             webMidiOutput.SendAt (float timestamp) [|message.Status; message.Data1; message.Data2|]
         member x.WriteMessages timestamp messages =
-            messages |> Array.iter (((x :> IMidiOutput<_>).WriteMessage )timestamp)
+            messages |> Array.iter (((x :> IMidiOutput<_,_>).WriteMessage )timestamp)
         member x.WriteSysex timestamp data =
             webMidiOutput.SendAt (float timestamp) data
         member x.DeviceInfo = (DeviceInfo device) :> _
-
-  
-(*
-open Fable.Core
-
-(************************************************)
-(*     You should remove the next lines and     *)
-(*    start writing your library in this file   *)
-(************************************************)
-
-[<Emit("$0 + $1")>]
-let add (x: int) (y: int) = jsNative
-
-*)

src/Midinette.Fable/src/Midinette.Fable.fs

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>0.0.0</Version>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
@@ -10,6 +10,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="*.fsproj; *.fs" PackagePath="fable\" />
+    <Content Include="paket.references" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Midinette\Midinette.fsproj" />

src/Midinette.Fable/src/Midinette.Fable.fsproj

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
+    <OutputPath>..\..\build\$(Configuration)\$(Platform)</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="PortMidiMidinettePlatformImpl.fs" />
+    <Content Include="paket.references" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\portmidisharp\PortMidiSharp\PortMidiSharp.fsproj" />
+    <ProjectReference Include="..\Midinette\Midinette.fsproj" />
+  </ItemGroup>
+  <Import Project="..\..\.paket\Paket.Restore.targets" />
+</Project>