Merge pull request #3 from Daniel127/release/v1.3.0

Release/v1.3.0

RtMidi.Net/Clients/MidiInputClient.cs

@@ -1,7 +1,7 @@
-using System.Diagnostics;
 using RtMidi.Net.Enums;
 using RtMidi.Net.Events;
 using RtMidi.Net.InteropServices;
+using System.Diagnostics;
 
 namespace RtMidi.Net.Clients;
 
@@ -46,7 +46,7 @@ public bool IgnoreSenseMessages
 
     public MidiInputClient(MidiDeviceInfo deviceInfo) : base(deviceInfo, new RtMidiIn())
     {
-        _rtMidiInClient = (RtMidiIn) RtMidiClient;
+        _rtMidiInClient = (RtMidiIn)RtMidiClient;
     }
 
     public void ActivateMessageReceivedEvent()
@@ -66,8 +66,8 @@ private void IgnoreMessageTypes(bool sysex, bool time, bool sense)
 
     private void InternalMessageReceived(double timestamp, IntPtr messagePtr, UIntPtr messageSize, IntPtr userDataPtr)
     {
-        var messageData = new byte [(int) messageSize];
-        System.Runtime.InteropServices.Marshal.Copy(messagePtr, messageData, 0, (int) messageSize);
+        var messageData = new byte[(int)messageSize];
+        System.Runtime.InteropServices.Marshal.Copy(messagePtr, messageData, 0, (int)messageSize);
         var message = ConvertMessage(messageData);
         var midiEventArgs = new MidiMessageReceivedEventArgs(message, TimeSpan.FromSeconds(timestamp));
         OnMessageReceived?.Invoke(this, midiEventArgs);
@@ -93,7 +93,7 @@ public async Task<(MidiMessage, TimeSpan)> GetMessageAsync(CancellationToken can
         {
             Stopwatch stopwatch = new();
             byte[] messageData;
-            
+
             stopwatch.Start();
             do
             {
@@ -113,10 +113,10 @@ private static MidiMessage ConvertMessage(IReadOnlyList<byte> message)
     {
         MidiMessageType type;
 
-        if (message[0] is >= (byte) MidiMessageType.NoteOff and < (byte) MidiMessageType.SystemExclusive)
+        if (message[0] is >= (byte)MidiMessageType.NoteOff and < (byte)MidiMessageType.SystemExclusive)
         {
-            var channel = (MidiChannel) (0b_0000_1111 & message[0]);
-            type = (MidiMessageType) (0b_1111_0000 & message[0]);
+            var channel = (MidiChannel)(0b_0000_1111 & message[0]);
+            type = (MidiMessageType)(0b_1111_0000 & message[0]);
 
             switch (type)
             {
@@ -143,7 +143,7 @@ private static MidiMessage ConvertMessage(IReadOnlyList<byte> message)
             return new MidiMessageUnknown(message.ToArray());
         }
 
-        type = (MidiMessageType) message[0];
+        type = (MidiMessageType)message[0];
         switch (type)
         {
             case MidiMessageType.SystemExclusive:

RtMidi.Net/Clients/MidiOutputClient.cs

@@ -9,7 +9,7 @@ public class MidiOutputClient : MidiClient
 
     public MidiOutputClient(MidiDeviceInfo deviceInfo) : base(deviceInfo, new RtMidiOut())
     {
-        _rtMidiOutClient = (RtMidiOut) RtMidiClient;
+        _rtMidiOutClient = (RtMidiOut)RtMidiClient;
     }
 
     public void SendMessage(byte[] message)
@@ -64,7 +64,7 @@ private static byte[] ConvertMessage(MidiMessage message)
             },
             MidiMessageType.SystemExclusive when message is MidiMessageSystemExclusive(var data, _) => data,
             //TODO Create Message for TimeCodeQuarterFrame
-            MidiMessageType.TimeCodeQuarterFrame when message is MidiMessageUnknown (var data, _) => data,
+            MidiMessageType.TimeCodeQuarterFrame when message is MidiMessageUnknown(var data, _) => data,
             MidiMessageType.SongPositionPointer when message is MidiMessageSongPositionPointer songPosPointer => new[]
             {
                 (byte) songPosPointer.Type,
@@ -97,12 +97,12 @@ private static byte[] ConvertMessage(MidiMessage message)
 
         byte ByteFrom(MidiMessageType messageType, MidiChannel channel)
         {
-            return (byte) ((byte) messageType | (byte) channel);
+            return (byte)((byte)messageType | (byte)channel);
         }
 
         byte[] DefaultMessage(MidiMessage midiMessage)
         {
-            return new[] {(byte) midiMessage.Type};
+            return new[] { (byte)midiMessage.Type };
         }
     }
 }

RtMidi.Net/Enums/MidiApi.cs

@@ -7,6 +7,8 @@ public enum MidiApi : byte
     LinuxAlsa,
     UnixJack,
     WindowsMultimediaMidi,
-    WindowsKernelStreaming,
     RtMidiDummy,
+    WebMidi,
+    WindowsUwp,
+    Android,
 }

RtMidi.Net/Enums/MidiMessageType.cs

@@ -9,7 +9,7 @@ namespace RtMidi.Net.Enums;
 public enum MidiMessageType : byte
 {
     Unknown = 0,
-    
+
     NoteOff = 0b_1000_0000,
     NoteOn = 0b_1001_0000,
     PolyphonicKeyPressure = 0b_1010_0000,

RtMidi.Net/Enums/MusicNote.cs

@@ -14,7 +14,7 @@ public enum MusicNote : byte
     A = 9,
     ASharp = 10,
     B = 11,
-    
+
     Do = C,
     DoSharp = CSharp,
     Re = D,

RtMidi.Net/InteropServices/RtMidiBase.cs

@@ -1,5 +1,5 @@
-using System.Runtime.InteropServices;
 using RtMidi.Net.Enums;
+using System.Runtime.InteropServices;
 
 namespace RtMidi.Net.InteropServices;
 
@@ -19,7 +19,7 @@ internal abstract class RtMidiBase : IDisposable
     /// </remarks>
     /// <returns>Returns true if a port is open and false if not.</returns>
     public bool IsPortOpen { get; private set; }
-    
+
     protected RtMidiBase(IntPtr rtMidiPtr)
     {
         RtMidiPtr = rtMidiPtr;
@@ -97,7 +97,7 @@ public string GetPortName(uint portNumber, uint? nameSize = null)
             bufferNameSize = nameSize.Value;
         }
 
-        messagePtr = Marshal.AllocHGlobal((int) bufferNameSize);
+        messagePtr = Marshal.AllocHGlobal((int)bufferNameSize);
         try
         {
             resultInterop = RtMidiInterop.rtmidi_get_port_name(RtMidiPtr, portNumber, messagePtr, ref bufferNameSize);
@@ -159,7 +159,7 @@ public static IReadOnlyCollection<MidiApi> GetCompiledApi()
         var unmanagedPointer = Marshal.AllocHGlobal(apis.Length);
         Marshal.Copy(apis, 0, unmanagedPointer, apis.Length);
         var result = RtMidiInterop.rtmidi_get_compiled_api(unmanagedPointer, sizeof(MidiApi));
-        apis = new byte [result];
+        apis = new byte[result];
         Marshal.Copy(unmanagedPointer, apis, 0, result);
         var apisResult = apis.Cast<MidiApi>().ToList();
         Marshal.FreeHGlobal(unmanagedPointer);
@@ -203,6 +203,17 @@ public static string GetApiDisplayName(MidiApi api)
         return name ?? string.Empty;
     }
 
+    /// <summary>
+    /// Return the version of the RtMidi library.
+    /// </summary>
+    /// <returns> The version of the RtMidi library </returns>
+    public static string GetRtMidiVersion()
+    {
+        var ptr = RtMidiInterop.rtmidi_get_version();
+        var name = Marshal.PtrToStringUTF8(ptr);
+        return name ?? string.Empty;
+    }
+
     /// <summary>
     /// Return the compiled MIDI API having the given name.
     /// </summary>

RtMidi.Net/InteropServices/RtMidiCallback.cs

@@ -3,4 +3,4 @@
 namespace RtMidi.Net.InteropServices;
 
 [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-internal delegate void RtMidiCallback (double timestamp, IntPtr message, UIntPtr size, IntPtr userData);
+internal delegate void RtMidiCallback(double timestamp, IntPtr message, UIntPtr size, IntPtr userData);

RtMidi.Net/InteropServices/RtMidiIn.cs

@@ -1,5 +1,5 @@
-using System.Runtime.InteropServices;
 using RtMidi.Net.Enums;
+using System.Runtime.InteropServices;
 
 namespace RtMidi.Net.InteropServices;
 
@@ -121,12 +121,12 @@ public void IgnoreTypes(bool midiSysex = true, bool midiTime = true, bool midiSe
     {
         var size = 1024;
         var messagePtr = Marshal.AllocHGlobal(size);
-        
+
         var timestamp = RtMidiInterop.rtmidi_in_get_message(RtMidiPtr, messagePtr, ref size);
         var message = new byte[size];
         Marshal.Copy(messagePtr, message, 0, size);
         Marshal.FreeHGlobal(messagePtr);
-        
+
         return (message, timestamp);
     }