changed PPQN checks to avoid smaller than 24 instead of multiple of 24

soldgarden · Feb 3, 2018 · 50ed89d · 50ed89d
1 parent 4f760ec
commit 50ed89d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/Source/Sanford.Multimedia.Midi/Clocks/PpqnClock.cs b/Source/Sanford.Multimedia.Midi/Clocks/PpqnClock.cs
@@ -207,12 +207,7 @@ public int Ppqn
                 if(value < PpqnMinValue)
                 {
                     throw new ArgumentOutOfRangeException("Ppqn", value,
-                        "Pulses per quarter note out of range.");
-                }
-                else if(value % PpqnMinValue != 0)
-                {
-                    throw new ArgumentException(
-                        "Pulses per quarter note is not a multiple of 24.");
+                        "Pulses per quarter note is smaller than 24.");
                 }
 
                 #endregion

diff --git a/Source/Sanford.Multimedia.Midi/Device Classes/OutputDevice Classes/OutputStream.cs b/Source/Sanford.Multimedia.Midi/Device Classes/OutputDevice Classes/OutputStream.cs
@@ -529,9 +529,10 @@ public int Division
                 {
                     throw new ObjectDisposedException("OutputStream");
                 }
-                else if((value % PpqnClock.PpqnMinValue) != 0)
+                else if(value < PpqnClock.PpqnMinValue)
                 {
-                    throw new ArgumentException();
+                    throw new ArgumentOutOfRangeException("Ppqn", value,
+                        "Pulses per quarter note is smaller than 24.");
                 }
 
                 #endregion

diff --git a/Source/Sanford.Multimedia.Midi/Messages/Message Builders/SongPositionPointerBuilder.cs b/Source/Sanford.Multimedia.Midi/Messages/Message Builders/SongPositionPointerBuilder.cs
@@ -193,10 +193,10 @@ public int Ppqn
             {
                 #region Require
 
-                if(value % PpqnClock.PpqnMinValue != 0)
+                if(value < PpqnClock.PpqnMinValue)
                 {
-                    throw new ArgumentException(
-                        "Invalid pulses per quarter note value.");
+                    throw new ArgumentOutOfRangeException("Ppqn", value,
+                         "Pulses per quarter note is smaller than 24.");
                 }
 
                 #endregion

diff --git a/Source/Sanford.Multimedia.Midi/Sequencing/MidiFileProperties.cs b/Source/Sanford.Multimedia.Midi/Sequencing/MidiFileProperties.cs
@@ -244,7 +244,7 @@ private void AssertValid()
             else
             {
                 Debug.Assert(SequenceType == SequenceType.Ppqn);
-                Debug.Assert(Division % PpqnClock.PpqnMinValue == 0);
+                Debug.Assert(Division >= PpqnClock.PpqnMinValue);
             }
         }
 
@@ -345,10 +345,10 @@ public int Division
                 }
                 else 
                 {
-                    if(value % PpqnClock.PpqnMinValue != 0)
+                    if(value < PpqnClock.PpqnMinValue)
                     {
-                        throw new ArgumentException(
-                            "Invalid pulses per quarter note value.");
+                        throw new ArgumentOutOfRangeException("Ppqn", value,
+                            "Pulses per quarter note is smaller than 24.");
                     }
                     else
                     {