[Release] Code cleanup

melanchall · melanchall · commit 1748f93e80a6 · 2023-12-22T18:51:16.000+03:00
diff --git a/Docs/docfx.json b/Docs/docfx.json
@@ -38,7 +38,7 @@
       "_enableSearch": true,
       "_appLogoPath": "images/logo.png",
       "_appFaviconPath": "images/favicon.png",
-      "_appFooter": "2024 / Generated by <a href=\"https://dotnet.github.io/docfx\">DocFX</a>",
+      "_appFooter": "2023 / Generated by <a href=\"https://dotnet.github.io/docfx\">DocFX</a>",
       "_disableContribution": true
     },
     "template": [
diff --git a/DryWetMidi/Common/MathUtilities.cs b/DryWetMidi/Common/MathUtilities.cs
@@ -133,11 +133,9 @@ public static long LeastCommonMultiple(long a, long b)
 
         public static long GreatestCommonDivisor(long a, long b)
         {
-            long remainder;
-
             while (b != 0)
             {
-                remainder = a % b;
+                var remainder = a % b;
                 a = b;
                 b = remainder;
             }
diff --git a/DryWetMidi/Composing/Actions/StepAction.cs b/DryWetMidi/Composing/Actions/StepAction.cs
@@ -6,7 +6,7 @@ internal abstract class StepAction : PatternAction
     {
         #region Constructor
 
-        public StepAction(ITimeSpan step)
+        protected StepAction(ITimeSpan step)
         {
             Step = step;
         }
diff --git a/DryWetMidi/Core/Events/Base/MidiEvent.cs b/DryWetMidi/Core/Events/Base/MidiEvent.cs
@@ -34,7 +34,7 @@ public abstract class MidiEvent
         /// Initializes a new instance of the <see cref="MidiEvent"/> with the specified event type.
         /// </summary>
         /// <param name="eventType">The type of event.</param>
-        public MidiEvent(MidiEventType eventType)
+        protected MidiEvent(MidiEventType eventType)
         {
             EventType = eventType;
         }
diff --git a/DryWetMidi/Core/Events/Meta/BaseTextEvent.cs b/DryWetMidi/Core/Events/Meta/BaseTextEvent.cs
@@ -18,7 +18,7 @@ public abstract class BaseTextEvent : MetaEvent
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseTextEvent"/>.
         /// </summary>
-        public BaseTextEvent(MidiEventType eventType)
+        protected BaseTextEvent(MidiEventType eventType)
             : base(eventType)
         {
         }
@@ -29,7 +29,7 @@ public BaseTextEvent(MidiEventType eventType)
         /// <param name="eventType">The type of event.</param>
         /// <param name="text">Text contained in the event.</param>
         /// <exception cref="InvalidEnumArgumentException"><paramref name="eventType"/> specified an invalid value.</exception>
-        public BaseTextEvent(MidiEventType eventType, string text)
+        protected BaseTextEvent(MidiEventType eventType, string text)
             : this(eventType)
         {
             Text = text;
diff --git a/DryWetMidi/Core/MidiReader.cs b/DryWetMidi/Core/MidiReader.cs
@@ -298,10 +298,11 @@ public int ReadVlqNumber()
         public long ReadVlqLongNumber()
         {
             long result = 0;
-            byte b;
 
             try
             {
+                byte b;
+
                 do
                 {
                     b = ReadByte();
diff --git a/DryWetMidi/Interaction/Chords/ChordsBuilder.cs b/DryWetMidi/Interaction/Chords/ChordsBuilder.cs
@@ -11,7 +11,7 @@ private class ChordDescriptor
         {
             private readonly int _notesMinCount;
 
-            public ChordDescriptor(Note firstNote, int notesMinCount)
+            protected ChordDescriptor(Note firstNote, int notesMinCount)
             {
                 Time = firstNote.Time;
                 Notes.Add(firstNote);
diff --git a/DryWetMidi/Interaction/Chords/ChordsManagingUtilities.cs b/DryWetMidi/Interaction/Chords/ChordsManagingUtilities.cs
@@ -1052,7 +1052,7 @@ internal static int ProcessChordsInternal(
                 : null;
 
             var chordsBuilder = new ChordsBuilder(settings);
-            var chords = chordsBuilder.GetChordsLazy(eventsCollections.GetTimedEventsLazy(eventsCount, settings?.NoteDetectionSettings?.TimedEventDetectionSettings, false), collectedTimedEvents != null, collectedTimedEvents);
+            var chords = chordsBuilder.GetChordsLazy(eventsCollections.GetTimedEventsLazy(eventsCount, settings.NoteDetectionSettings?.TimedEventDetectionSettings, false), collectedTimedEvents != null, collectedTimedEvents);
 
             foreach (var chordAt in chords)
             {
diff --git a/DryWetMidi/Interaction/GetObjects/GetObjectsUtilities.cs b/DryWetMidi/Interaction/GetObjects/GetObjectsUtilities.cs
@@ -414,7 +414,6 @@ private static IEnumerable<ITimedObject> EnumerateObjectsFromSortedTimedObjects(
                 ?? (getChords ? settings.ChordDetectionSettings?.NoteDetectionSettings : null)
                 ?? new NoteDetectionSettings();
             var chordDetectionSettings = settings.ChordDetectionSettings ?? new ChordDetectionSettings();
-            var restDetectionSettings = settings.RestDetectionSettings ?? new RestDetectionSettings();
 
             var timedObjects = processedTimedObjects;
 
@@ -429,11 +428,6 @@ private static IEnumerable<ITimedObject> EnumerateObjectsFromSortedTimedObjects(
 
             //
 
-            var notesLastEndTimes = new Dictionary<object, long>();
-            var noteDescriptorProvider = NoteDescriptorProviders[restDetectionSettings.RestSeparationPolicy];
-            var setRestChannel = SetRestChannel[restDetectionSettings.RestSeparationPolicy];
-            var setRestNoteNumber = SetRestNoteNumber[restDetectionSettings.RestSeparationPolicy];
-
             foreach (var timedObject in timedObjects)
             {
                 var processed = false;
diff --git a/DryWetMidi/Interaction/Notes/NotesManagingUtilities.cs b/DryWetMidi/Interaction/Notes/NotesManagingUtilities.cs
@@ -22,7 +22,7 @@ private abstract class NoteOnsHolderBase<TDescriptor> where TDescriptor : IObjec
             private readonly Stack<LinkedListNode<TDescriptor>> _nodesStack;
             private readonly Queue<LinkedListNode<TDescriptor>> _nodesQueue;
 
-            public NoteOnsHolderBase(NoteStartDetectionPolicy noteStartDetectionPolicy)
+            protected NoteOnsHolderBase(NoteStartDetectionPolicy noteStartDetectionPolicy)
             {
                 switch (noteStartDetectionPolicy)
                 {
@@ -110,13 +110,13 @@ private interface IObjectDescriptorIndexed : IObjectDescriptor
 
         private class NoteDescriptor : IObjectDescriptor
         {
+            private TimedEvent _noteOnTimedEvent;
+
             public NoteDescriptor(TimedEvent noteOnTimedEvent)
             {
-                NoteOnTimedEvent = noteOnTimedEvent;
+                _noteOnTimedEvent = noteOnTimedEvent;
             }
 
-            public TimedEvent NoteOnTimedEvent { get; }
-
             public TimedEvent NoteOffTimedEvent { get; set; }
 
             public bool IsCompleted => NoteOffTimedEvent != null;
@@ -125,9 +125,9 @@ public ITimedObject GetObject(Func<NoteData, Note> constructor)
             {
                 return IsCompleted
                     ? (constructor == null
-                        ? new Note(NoteOnTimedEvent, NoteOffTimedEvent, false)
-                        : constructor(new NoteData(NoteOnTimedEvent, NoteOffTimedEvent)))
-                    : (ITimedObject)NoteOnTimedEvent;
+                        ? new Note(_noteOnTimedEvent, NoteOffTimedEvent, false)
+                        : constructor(new NoteData(_noteOnTimedEvent, NoteOffTimedEvent)))
+                    : (ITimedObject)_noteOnTimedEvent;
             }
         }
 
@@ -166,18 +166,18 @@ public TimedObjectAt<ITimedObject> GetIndexedObject(Func<NoteData, Note> constru
 
         private class TimedEventDescriptor : IObjectDescriptor
         {
+            private TimedEvent _timedEvent;
+
             public TimedEventDescriptor(TimedEvent timedEvent)
             {
-                TimedEvent = timedEvent;
+                _timedEvent = timedEvent;
             }
 
-            public TimedEvent TimedEvent { get; }
-
             public bool IsCompleted { get; } = true;
 
             public ITimedObject GetObject(Func<NoteData, Note> constructor)
             {
-                return TimedEvent;
+                return _timedEvent;
             }
         }
 
diff --git a/DryWetMidi/Interaction/TimeSpan/Converters/BarBeatFractionTimeSpanConverter.cs b/DryWetMidi/Interaction/TimeSpan/Converters/BarBeatFractionTimeSpanConverter.cs
@@ -158,7 +158,6 @@ public long ConvertFrom(ITimeSpan timeSpan, long time, TempoMap tempoMap)
                     lastBarLength = BarBeatUtilities.GetBarLength(lastTimeSignature, ticksPerQuarterNote);
                     lastBeatLength = BarBeatUtilities.GetBeatLength(lastTimeSignature, ticksPerQuarterNote);
 
-                    // TODO: lastBarLength can be 0
                     var currentBars = Math.Min(deltaTime / lastBarLength, bars);
                     bars -= currentBars;
                     lastTime += currentBars * lastBarLength;
diff --git a/DryWetMidi/Interaction/TimeSpan/Converters/BarBeatTicksTimeSpanConverter.cs b/DryWetMidi/Interaction/TimeSpan/Converters/BarBeatTicksTimeSpanConverter.cs
@@ -148,7 +148,6 @@ public long ConvertFrom(ITimeSpan timeSpan, long time, TempoMap tempoMap)
                 lastBarLength = BarBeatUtilities.GetBarLength(lastTimeSignature, ticksPerQuarterNote);
                 lastBeatLength = BarBeatUtilities.GetBeatLength(lastTimeSignature, ticksPerQuarterNote);
 
-                // TODO: lastBarLength can be 0
                 var currentBars = Math.Min(deltaTime / lastBarLength, bars);
                 bars -= currentBars;
                 lastTime += currentBars * lastBarLength;
diff --git a/DryWetMidi/Interaction/TimeSpan/Parsers/MidiTimeSpanParser.cs b/DryWetMidi/Interaction/TimeSpan/Parsers/MidiTimeSpanParser.cs
@@ -12,7 +12,7 @@ internal static class MidiTimeSpanParser
 
         private static readonly string[] Patterns = new[]
         {
-            $@"{TimeSpanGroup}",
+            TimeSpanGroup,
         };
 
         private const string OutOfRange = "Time span is out of range.";
diff --git a/DryWetMidi/Interaction/TimeSpan/Parsers/MusicalTimeSpanParser.cs b/DryWetMidi/Interaction/TimeSpan/Parsers/MusicalTimeSpanParser.cs
@@ -117,7 +117,7 @@ internal static ParsingResult TryParse(string input, out MusicalTimeSpan timeSpa
 
         private static string GetMnemonicGroup(string groupName, IEnumerable<string> mnemonics)
         {
-            return $@"(?<{groupName}>[{string.Join(string.Empty, mnemonics)}])";
+            return $"(?<{groupName}>[{string.Join(string.Empty, mnemonics)}])";
         }
 
         #endregion
diff --git a/DryWetMidi/Interaction/TimedEvents/TimedEventsManagingUtilities.cs b/DryWetMidi/Interaction/TimedEvents/TimedEventsManagingUtilities.cs
@@ -843,8 +843,6 @@ internal static IEnumerable<TimedEvent> GetTimedEventsLazy(this IEnumerable<Midi
 
                 time += midiEvent.DeltaTime;
 
-                TimedEvent timedEvent = null;
-
                 if (useCustomConstructor)
                 {
                     yield return constructor(new TimedEventData(
@@ -855,7 +853,7 @@ internal static IEnumerable<TimedEvent> GetTimedEventsLazy(this IEnumerable<Midi
                 }
                 else
                 {
-                    timedEvent = new TimedEvent(cloneEvent ? midiEvent.Clone() : midiEvent);
+                    var timedEvent = new TimedEvent(cloneEvent ? midiEvent.Clone() : midiEvent);
                     timedEvent._time = time;
                     yield return timedEvent;
                 }
diff --git a/DryWetMidi/Interaction/TimedObject/TimedObjectsWriter.cs b/DryWetMidi/Interaction/TimedObject/TimedObjectsWriter.cs
@@ -168,8 +168,6 @@ private void WriteTimedEvent(TimedEvent timedEvent)
 
         private TimedEvent[] GetObjectTimedEvents(ITimedObject timedObject)
         {
-            var result = new List<TimedEvent>();
-
             var timedEvent = timedObject as TimedEvent;
             if (timedEvent != null)
                 return new[] { timedEvent };
diff --git a/DryWetMidi/Melanchall.DryWetMidi.csproj b/DryWetMidi/Melanchall.DryWetMidi.csproj
@@ -33,7 +33,7 @@
       * Build musical compositions.
       * Perform complex musical tasks like quantizing, notes splitting or converting MIDI files to CSV.
     </Description>
-    <Copyright>Copyright © Melanchall 2024</Copyright>
+    <Copyright>Copyright © Melanchall 2023</Copyright>
     <PackageTags>midi smf music composing notes chords device playback record</PackageTags>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
diff --git a/DryWetMidi/Multimedia/Clock/TickGenerator/Session/TickGeneratorSession.cs b/DryWetMidi/Multimedia/Clock/TickGenerator/Session/TickGeneratorSession.cs
@@ -20,7 +20,6 @@ public static IntPtr GetSessionHandle()
             {
                 if (_handle == IntPtr.Zero)
                 {
-                    var apiType = CommonApiProvider.Api.Api_GetApiType();
                     NativeApiUtilities.HandleTickGeneratorNativeApiResult(
                         TickGeneratorSessionApiProvider.Api.Api_OpenSession(out _handle));
                 }
diff --git a/DryWetMidi/Multimedia/InputDevice/InputDevice.cs b/DryWetMidi/Multimedia/InputDevice/InputDevice.cs
@@ -589,7 +589,7 @@ private void OnPacket_Mac(IntPtr pktlist, int packetIndex, out int packetsCount)
             }
             catch (Exception ex)
             {
-                var exception = new MidiDeviceException($"Failed to parse message.", ex);
+                var exception = new MidiDeviceException("Failed to parse message.", ex);
                 exception.Data.Add("Data", data);
                 OnError(exception);
             }
@@ -717,7 +717,7 @@ private void OnShortMessage(int message)
             }
             catch (Exception ex)
             {
-                var exception = new MidiDeviceException($"Failed to parse short message.", ex);
+                var exception = new MidiDeviceException("Failed to parse short message.", ex);
                 exception.Data.Add("Message", message);
                 OnError(exception);
             }
@@ -755,7 +755,7 @@ private void OnSysExMessage(IntPtr sysExHeaderPointer)
             }
             catch (Exception ex)
             {
-                var exception = new MidiDeviceException($"Failed to parse system exclusive message.", ex);
+                var exception = new MidiDeviceException("Failed to parse system exclusive message.", ex);
                 exception.Data.Add("Data", data);
                 OnError(exception);
             }
diff --git a/DryWetMidi/Multimedia/MidiDevice.cs b/DryWetMidi/Multimedia/MidiDevice.cs
@@ -1,6 +1,6 @@
-﻿using System;
+﻿using Melanchall.DryWetMidi.Common;
+using System;
 using System.Collections.Generic;
-using Melanchall.DryWetMidi.Common;
 
 namespace Melanchall.DryWetMidi.Multimedia
 {
@@ -157,7 +157,7 @@ public override string ToString()
         public void Dispose()
         {
             if (Context == CreationContext.VirtualDevice)
-                throw new InvalidOperationException($"Disposing of a subdevice of a virtual device is prohibited.");
+                throw new InvalidOperationException("Disposing of a subdevice of a virtual device is prohibited.");
 
             Dispose(true);
             GC.SuppressFinalize(this);
diff --git a/DryWetMidi/Multimedia/NativeHandle.cs b/DryWetMidi/Multimedia/NativeHandle.cs
@@ -7,7 +7,7 @@ internal abstract class NativeHandle : SafeHandle
     {
         #region Constructor
 
-        public NativeHandle(IntPtr validHandle)
+        protected NativeHandle(IntPtr validHandle)
                 : base(IntPtr.Zero, true)
         {
             SetHandle(validHandle);
diff --git a/DryWetMidi/Multimedia/Playback/PlaybackDataTracker.cs b/DryWetMidi/Multimedia/Playback/PlaybackDataTracker.cs
@@ -40,13 +40,13 @@ public EventWithMetadata(MidiEvent midiEvent, object metadata)
 
         private abstract class DataChange<TData> : IMetadata
         {
-            public DataChange(TData data, object metadata)
+            protected DataChange(TData data, object metadata)
             {
                 Data = data;
                 Metadata = metadata;
             }
 
-            public DataChange(TData data, object metadata, bool isDefault)
+            protected DataChange(TData data, object metadata, bool isDefault)
                 : this(data, metadata)
             {
                 IsDefault = isDefault;
@@ -56,7 +56,7 @@ public DataChange(TData data, object metadata, bool isDefault)
 
             public object Metadata { get; set; }
 
-            public bool IsDefault { get; set; }
+            public bool IsDefault { get; }
         }
 
         private sealed class ProgramChange : DataChange<SevenBitNumber>
diff --git a/DryWetMidi/MusicTheory/ChordProgression/ChordProgressionParser.cs b/DryWetMidi/MusicTheory/ChordProgression/ChordProgressionParser.cs
@@ -11,14 +11,14 @@ internal static class ChordProgressionParser
         
         private const string ScaleDegreeGroupName = "sd";
 
-        private static readonly string ScaleDegreeGroup = $@"(?<{ScaleDegreeGroupName}>(?i:M{{0,4}}(CM|CD|D?C{{0,3}})(XC|XL|L?X{{0,3}})(IX|IV|V?I{{0,3}})))";
+        private static readonly string ScaleDegreeGroup = $"(?<{ScaleDegreeGroupName}>(?i:M{{0,4}}(CM|CD|D?C{{0,3}})(XC|XL|L?X{{0,3}})(IX|IV|V?I{{0,3}})))";
 
         private static readonly string[] Patterns = new[]
         {
             $@"{ScaleDegreeGroup}\s*{ChordParser.ChordCharacteristicsGroup}"
         };
 
-        private static Dictionary<char, int> RomanMap = new Dictionary<char, int>
+        private static readonly Dictionary<char, int> RomanMap = new Dictionary<char, int>
         {
             ['i'] = 1,
             ['v'] = 5,
diff --git a/DryWetMidi/MusicTheory/Note/NoteNameParser.cs b/DryWetMidi/MusicTheory/Note/NoteNameParser.cs
@@ -18,7 +18,7 @@ internal static class NoteNameParser
         private static readonly string[] Patterns = new[]
         {
             $@"{NoteNameGroup}\s*{AccidentalGroup}",
-            $@"{NoteNameGroup}",
+            NoteNameGroup,
         };
 
         #endregion
diff --git a/DryWetMidi/Tools/Merger/Merger.MergeFiles.cs b/DryWetMidi/Tools/Merger/Merger.MergeFiles.cs
diff --git a/DryWetMidi/Tools/Merger/ObjectsMerger.cs b/DryWetMidi/Tools/Merger/ObjectsMerger.cs
diff --git a/DryWetMidi/Tools/Quantizer/Quantizer.cs b/DryWetMidi/Tools/Quantizer/Quantizer.cs
diff --git a/DryWetMidi/Tools/Resizer/Resizer.Resize.cs b/DryWetMidi/Tools/Resizer/Resizer.Resize.cs
diff --git a/DryWetMidi/Tools/Splitter/Splitter.CutPart.cs b/DryWetMidi/Tools/Splitter/Splitter.CutPart.cs
diff --git a/Utilities/Common/UiUtilities.cs b/Utilities/Common/UiUtilities.cs

Original file line number	Diff line number	Diff line change
`@@ -133,11 +133,9 @@ public static long LeastCommonMultiple(long a, long b)`
`133`	`133`
`134`	`134`	`public static long GreatestCommonDivisor(long a, long b)`
`135`	`135`	`{`
`136`		`- long remainder;`
`137`		`-`
`138`	`136`	`while (b != 0)`
`139`	`137`	`{`
`140`		`- remainder = a % b;`
	`138`	`+ var remainder = a % b;`
`141`	`139`	`a = b;`
`142`	`140`	`b = remainder;`
`143`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ internal abstract class StepAction : PatternAction`
`6`	`6`	`{`
`7`	`7`	`#region Constructor`
`8`	`8`
`9`		`- public StepAction(ITimeSpan step)`
	`9`	`+ protected StepAction(ITimeSpan step)`
`10`	`10`	`{`
`11`	`11`	`Step = step;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public abstract class MidiEvent`
`34`	`34`	`/// Initializes a new instance of the <see cref="MidiEvent"/> with the specified event type.`
`35`	`35`	`/// </summary>`
`36`	`36`	`/// <param name="eventType">The type of event.</param>`
`37`		`- public MidiEvent(MidiEventType eventType)`
	`37`	`+ protected MidiEvent(MidiEventType eventType)`
`38`	`38`	`{`
`39`	`39`	`EventType = eventType;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public abstract class BaseTextEvent : MetaEvent`
`18`	`18`	`/// <summary>`
`19`	`19`	`/// Initializes a new instance of the <see cref="BaseTextEvent"/>.`
`20`	`20`	`/// </summary>`
`21`		`- public BaseTextEvent(MidiEventType eventType)`
	`21`	`+ protected BaseTextEvent(MidiEventType eventType)`
`22`	`22`	`: base(eventType)`
`23`	`23`	`{`
`24`	`24`	`}`
`@@ -29,7 +29,7 @@ public BaseTextEvent(MidiEventType eventType)`
`29`	`29`	`/// <param name="eventType">The type of event.</param>`
`30`	`30`	`/// <param name="text">Text contained in the event.</param>`
`31`	`31`	`/// <exception cref="InvalidEnumArgumentException"><paramref name="eventType"/> specified an invalid value.</exception>`
`32`		`- public BaseTextEvent(MidiEventType eventType, string text)`
	`32`	`+ protected BaseTextEvent(MidiEventType eventType, string text)`
`33`	`33`	`: this(eventType)`
`34`	`34`	`{`
`35`	`35`	`Text = text;`
Original file line number	Diff line number	Diff line change
`@@ -298,10 +298,11 @@ public int ReadVlqNumber()`
`298`	`298`	`public long ReadVlqLongNumber()`
`299`	`299`	`{`
`300`	`300`	`long result = 0;`
`301`		`- byte b;`
`302`	`301`
`303`	`302`	`try`
`304`	`303`	`{`
	`304`	`+ byte b;`
	`305`	`+`
`305`	`306`	`do`
`306`	`307`	`{`
`307`	`308`	`b = ReadByte();`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ private class ChordDescriptor`
`11`	`11`	`{`
`12`	`12`	`private readonly int _notesMinCount;`
`13`	`13`
`14`		`- public ChordDescriptor(Note firstNote, int notesMinCount)`
	`14`	`+ protected ChordDescriptor(Note firstNote, int notesMinCount)`
`15`	`15`	`{`
`16`	`16`	`Time = firstNote.Time;`
`17`	`17`	`Notes.Add(firstNote);`
Original file line number	Diff line number	Diff line change
`@@ -1052,7 +1052,7 @@ internal static int ProcessChordsInternal(`
`1052`	`1052`	`: null;`
`1053`	`1053`
`1054`	`1054`	`var chordsBuilder = new ChordsBuilder(settings);`
`1055`		`- var chords = chordsBuilder.GetChordsLazy(eventsCollections.GetTimedEventsLazy(eventsCount, settings?.NoteDetectionSettings?.TimedEventDetectionSettings, false), collectedTimedEvents != null, collectedTimedEvents);`
	`1055`	`+ var chords = chordsBuilder.GetChordsLazy(eventsCollections.GetTimedEventsLazy(eventsCount, settings.NoteDetectionSettings?.TimedEventDetectionSettings, false), collectedTimedEvents != null, collectedTimedEvents);`
`1056`	`1056`
`1057`	`1057`	`foreach (var chordAt in chords)`
`1058`	`1058`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ private abstract class NoteOnsHolderBase<TDescriptor> where TDescriptor : IObjec`
`22`	`22`	`private readonly Stack<LinkedListNode<TDescriptor>> _nodesStack;`
`23`	`23`	`private readonly Queue<LinkedListNode<TDescriptor>> _nodesQueue;`
`24`	`24`
`25`		`- public NoteOnsHolderBase(NoteStartDetectionPolicy noteStartDetectionPolicy)`
	`25`	`+ protected NoteOnsHolderBase(NoteStartDetectionPolicy noteStartDetectionPolicy)`
`26`	`26`	`{`
`27`	`27`	`switch (noteStartDetectionPolicy)`
`28`	`28`	`{`
`@@ -110,13 +110,13 @@ private interface IObjectDescriptorIndexed : IObjectDescriptor`
`110`	`110`
`111`	`111`	`private class NoteDescriptor : IObjectDescriptor`
`112`	`112`	`{`
	`113`	`+ private TimedEvent _noteOnTimedEvent;`
	`114`	`+`
`113`	`115`	`public NoteDescriptor(TimedEvent noteOnTimedEvent)`
`114`	`116`	`{`
`115`		`- NoteOnTimedEvent = noteOnTimedEvent;`
	`117`	`+ _noteOnTimedEvent = noteOnTimedEvent;`
`116`	`118`	`}`
`117`	`119`
`118`		`- public TimedEvent NoteOnTimedEvent { get; }`
`119`		`-`
`120`	`120`	`public TimedEvent NoteOffTimedEvent { get; set; }`
`121`	`121`
`122`	`122`	`public bool IsCompleted => NoteOffTimedEvent != null;`
`@@ -125,9 +125,9 @@ public ITimedObject GetObject(Func<NoteData, Note> constructor)`
`125`	`125`	`{`
`126`	`126`	`return IsCompleted`
`127`	`127`	`? (constructor == null`
`128`		`- ? new Note(NoteOnTimedEvent, NoteOffTimedEvent, false)`
`129`		`- : constructor(new NoteData(NoteOnTimedEvent, NoteOffTimedEvent)))`
`130`		`- : (ITimedObject)NoteOnTimedEvent;`
	`128`	`+ ? new Note(_noteOnTimedEvent, NoteOffTimedEvent, false)`
	`129`	`+ : constructor(new NoteData(_noteOnTimedEvent, NoteOffTimedEvent)))`
	`130`	`+ : (ITimedObject)_noteOnTimedEvent;`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`@@ -166,18 +166,18 @@ public TimedObjectAt<ITimedObject> GetIndexedObject(Func<NoteData, Note> constru`
`166`	`166`
`167`	`167`	`private class TimedEventDescriptor : IObjectDescriptor`
`168`	`168`	`{`
	`169`	`+ private TimedEvent _timedEvent;`
	`170`	`+`
`169`	`171`	`public TimedEventDescriptor(TimedEvent timedEvent)`
`170`	`172`	`{`
`171`		`- TimedEvent = timedEvent;`
	`173`	`+ _timedEvent = timedEvent;`
`172`	`174`	`}`
`173`	`175`
`174`		`- public TimedEvent TimedEvent { get; }`
`175`		`-`
`176`	`176`	`public bool IsCompleted { get; } = true;`
`177`	`177`
`178`	`178`	`public ITimedObject GetObject(Func<NoteData, Note> constructor)`
`179`	`179`	`{`
`180`		`- return TimedEvent;`
	`180`	`+ return _timedEvent;`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`