- remove raw message from ctor

Lib.Midi/Messages/ControlChangeMessage.cs

@@ -9,8 +9,9 @@ namespace Lib.Midi.Messages
     public class ControlChangeMessage : MidiMessage
     {
         public ControlChangeMessage(long absolutTime, int channelNumber, int value)
+            : base(new ControlChangeEvent(absolutTime, channelNumber, (MidiController) 16, value))
         {
-            ControlChangeEvent controlChangeEvent = new(absolutTime, channelNumber, (MidiController) 16, value);
+            
         }
     }
 }

Lib.Midi/Messages/Factories/IMidiMessageFactory.cs

@@ -9,6 +9,6 @@ namespace Lib.Midi.Messages.Factories
 {
     public interface IMidiMessageFactory
     {
-        IMidiMessage Create(MidiInMessageEventArgs midiInMessageEventArgs);
+        IMidiMessage Create(MidiEvent midiEvent);
     }
 }

Lib.Midi/Messages/Factories/MidiMessageFactory.cs

@@ -9,14 +9,14 @@ namespace Lib.Midi.Messages.Factories
 {
     public class MidiMessageFactory : IMidiMessageFactory
     {
-        public IMidiMessage Create(MidiInMessageEventArgs midiInMessageEventArgs)
+        public IMidiMessage Create(MidiEvent midiEvent)
         {
-            if (midiInMessageEventArgs.MidiEvent is PitchWheelChangeEvent pitchWheelChangeEvent)
+            if (midiEvent is PitchWheelChangeEvent pitchWheelChangeEvent)
-                return new PitchWheelChangeMessage(pitchWheelChangeEvent, midiInMessageEventArgs.RawMessage);
+                return new PitchWheelChangeMessage(pitchWheelChangeEvent);
-            else if (midiInMessageEventArgs.MidiEvent is NoteOnEvent noteOnEvent)
+            else if (midiEvent is NoteOnEvent noteOnEvent)
-                return new NoteOnMessage(noteOnEvent, midiInMessageEventArgs.RawMessage);
+                return new NoteOnMessage(noteOnEvent);
-            else if (midiInMessageEventArgs.MidiEvent is NoteEvent noteEvent)
+            else if (midiEvent is NoteEvent noteEvent)
-                return new NoteMessage(noteEvent, midiInMessageEventArgs.RawMessage);
+                return new NoteMessage(noteEvent);
 
             return null;
         }

Lib.Midi/Messages/MidiMessage.cs

@@ -9,18 +9,11 @@ namespace Lib.Midi.Messages
 {
     public abstract class MidiMessage : IMidiMessage
     {
-        protected MidiMessage(MidiEvent midiEvent, int rawMessage)
+        protected readonly MidiEvent _midiEvent;
-        {
+        
-            ChannelNumber = midiEvent.Channel;
+        protected MidiMessage(MidiEvent midiEvent) => _midiEvent = midiEvent;
-            RawMessage = rawMessage;
-        }
 
-        protected MidiMessage()
+        public int ChannelNumber => _midiEvent.Channel;
-        {
+        public int RawMessage => _midiEvent.GetAsShortMessage();
-            
-        }
-
-        public int ChannelNumber { get; protected init; }
-        public int RawMessage { get; protected init; }
     }
 }

Lib.Midi/Messages/NoteMessage.cs

@@ -8,10 +8,13 @@ namespace Lib.Midi.Messages
 {
     public class NoteMessage : MidiMessage
     {
-        public NoteMessage(NoteEvent noteEvent, int rawMessage)
+        public NoteMessage(NoteEvent noteEvent)
-            : base(noteEvent, rawMessage) =>
+            : base(noteEvent)
-            NoteNumber = noteEvent.NoteNumber;
+        {
+            
+        }
         
-        public int NoteNumber { get; }
+        private NoteEvent NoteEvent => (NoteEvent) _midiEvent;
+        public int NoteNumber => NoteEvent.NoteNumber;
     }
 }

Lib.Midi/Messages/NoteOnMessage.cs

@@ -8,15 +8,13 @@ namespace Lib.Midi.Messages
 {
     public class NoteOnMessage : MidiMessage
     {
-        public NoteOnMessage(NoteOnEvent noteOnEvent, int rawMessage)
+        public NoteOnMessage(NoteOnEvent noteOnEvent)
-            : base(noteOnEvent, rawMessage) =>
+            : base(noteOnEvent)
-            NoteNumber = noteOnEvent.NoteNumber;
-
-        public NoteOnMessage()
         {
-            // NoteOnEvent noteOnEvent = new NoteOnEvent()
+            
         }
-        
+
-        public int NoteNumber { get; }
+        private NoteOnEvent NoteOnEvent => (NoteOnEvent) _midiEvent;
+        public int NoteNumber => NoteOnEvent.NoteNumber;
     }
 }

Lib.Midi/Messages/PitchWheelChangeMessage.cs

@@ -8,17 +8,19 @@ namespace Lib.Midi.Messages
 {
     public class PitchWheelChangeMessage : MidiMessage
     {
-        public PitchWheelChangeMessage(PitchWheelChangeEvent pitchWheelChangeEvent, int rawMessage)
+        public PitchWheelChangeMessage(PitchWheelChangeEvent pitchWheelChangeEvent)
-            : base(pitchWheelChangeEvent, rawMessage) =>
+            : base(pitchWheelChangeEvent)
-            Pitch = pitchWheelChangeEvent.Pitch;
+        {
+            
+        }
 
         public PitchWheelChangeMessage(long absoluteTime, int channelNumber, int pitch)
+            : base(new PitchWheelChangeEvent(absoluteTime, channelNumber, pitch))
         {
-            PitchWheelChangeEvent pitchWheelChangeEvent = new(absoluteTime, channelNumber, pitch);
+            
-            ChannelNumber = channelNumber;
-            RawMessage = pitchWheelChangeEvent.GetAsShortMessage();
         }
-        
+
-        public int Pitch { get; }
+        private PitchWheelChangeEvent PitchWheelChangeEvent => (PitchWheelChangeEvent) _midiEvent;
+        public int Pitch => PitchWheelChangeEvent.Pitch;
     }
 }

Lib.Midi/MidiCommunication.cs

@@ -75,8 +75,8 @@ namespace Lib.Midi
         }
 
         public void Send(IMidiMessage message) => _midiOut?.Send(message.RawMessage);
-        private void OnMidiInMessageReceived(object? sender, MidiInMessageEventArgs args) => MessageReceived?.Invoke(this, _midiMessageFactory.Create(args));
+        private void OnMidiInMessageReceived(object? sender, MidiInMessageEventArgs args) => MessageReceived?.Invoke(this, _midiMessageFactory.Create(args.MidiEvent));
-        private void OnMidiInErrorReceived(object? sender, MidiInMessageEventArgs args) => ErrorReceived?.Invoke(this, _midiMessageFactory.Create(args));
+        private void OnMidiInErrorReceived(object? sender, MidiInMessageEventArgs args) => ErrorReceived?.Invoke(this, _midiMessageFactory.Create(args.MidiEvent));
 
         public event EventHandler<IMidiMessage>? MessageReceived;
         public event EventHandler<IMidiMessage>? ErrorReceived;