LaunchQuantisation: Fixed fractional bar quantisation amounts

Author: drowaudio

modules/tracktion_engine/model/edit/tracktion_LaunchQuantisation.cpp

@@ -126,9 +126,12 @@ BeatPosition getNext (LaunchQType q, const tempo::Sequence& ts, BeatPosition pos
         barsBeats.bars = static_cast<int> (qFraction * (int) std::floor (barsPlusBeats / qFraction + adjustment));
         barsBeats.beats = {};
     }
-
-    // Fractional bars
-    barsBeats.beats = BeatDuration::fromBeats (qFraction * std::floor ((barsBeats.beats.inBeats() / qFraction) + adjustment));
+    else
+    {
+        // Fractional bars
+        const auto beatFraction = barsBeats.numerator * qFraction;
+        barsBeats.beats = BeatDuration::fromBeats (beatFraction * std::floor ((barsBeats.beats.inBeats() / beatFraction) + adjustment));
+    }
 
     return ts.toBeats (barsBeats);
 }

modules/tracktion_engine/model/edit/tracktion_LaunchQuantisation.test.cpp

@@ -68,20 +68,32 @@ class LaunchQuantisationTests : public juce::UnitTest
                              expectWithinAbsoluteError (n.inBeats(), next.inBeats(), 0.000001);
                          };
 
-        beginTest ("Bar");
+        beginTest ("Eight Bars");
         {
-            auto expectQ = [&] (auto c, auto n) { expectNext (c, n, LaunchQType::bar); };
+            auto expectQ = [&] (auto c, auto n) { expectNext (c, n, LaunchQType::eightBars); };
 
             expectQ (0_bp, 0_bp);
-            expectQ (1_bp, 4_bp);
-            expectQ (2_bp, 4_bp);
-            expectQ (3_bp, 4_bp);
-            expectQ (4_bp, 4_bp);
-            expectQ (5_bp, 8_bp);
-            expectQ (6_bp, 8_bp);
-            expectQ (7_bp, 8_bp);
-            expectQ (8_bp, 8_bp);
-            expectQ (9_bp, 12_bp);
+            expectQ (1_bp, 32_bp);
+            expectQ (8_bp, 32_bp);
+            expectQ (16_bp, 32_bp);
+            expectQ (32_bp, 32_bp);
+            expectQ (33_bp, 64_bp);
+            expectQ (63_bp, 64_bp);
+            expectQ (64_bp, 64_bp);
+            expectQ (65_bp, 96_bp);
+        }
+
+        beginTest ("Four Bars");
+        {
+            auto expectQ = [&] (auto c, auto n) { expectNext (c, n, LaunchQType::fourBars); };
+
+            expectQ (0_bp, 0_bp);
+            expectQ (1_bp, 16_bp);
+            expectQ (8_bp, 16_bp);
+            expectQ (15_bp, 16_bp);
+            expectQ (16_bp, 16_bp);
+            expectQ (17_bp, 32_bp);
+            expectQ (32_bp, 32_bp);
         }
 
         beginTest ("Two Bars");
@@ -100,69 +112,68 @@ class LaunchQuantisationTests : public juce::UnitTest
             expectQ (9_bp, 16_bp);
         }
 
-        beginTest ("Four Bars");
-        {
-            auto expectQ = [&] (auto c, auto n) { expectNext (c, n, LaunchQType::fourBars); };
-
-            expectQ (0_bp, 0_bp);
-            expectQ (1_bp, 16_bp);
-            expectQ (8_bp, 16_bp);
-            expectQ (15_bp, 16_bp);
-            expectQ (16_bp, 16_bp);
-            expectQ (17_bp, 32_bp);
-            expectQ (32_bp, 32_bp);
-        }
-
-        beginTest ("Eight Bars");
+        beginTest ("Bar");
         {
-            auto expectQ = [&] (auto c, auto n) { expectNext (c, n, LaunchQType::eightBars); };
+            auto expectQ = [&] (auto c, auto n) { expectNext (c, n, LaunchQType::bar); };
 
             expectQ (0_bp, 0_bp);
-            expectQ (1_bp, 32_bp);
-            expectQ (8_bp, 32_bp);
-            expectQ (16_bp, 32_bp);
-            expectQ (32_bp, 32_bp);
-            expectQ (33_bp, 64_bp);
-            expectQ (63_bp, 64_bp);
-            expectQ (64_bp, 64_bp);
-            expectQ (65_bp, 96_bp);
+            expectQ (1_bp, 4_bp);
+            expectQ (2_bp, 4_bp);
+            expectQ (3_bp, 4_bp);
+            expectQ (4_bp, 4_bp);
+            expectQ (5_bp, 8_bp);
+            expectQ (6_bp, 8_bp);
+            expectQ (7_bp, 8_bp);
+            expectQ (8_bp, 8_bp);
+            expectQ (9_bp, 12_bp);
         }
 
         beginTest ("Half");
         {
             auto expectQ = [&] (auto c, auto n) { expectNext (c, n, LaunchQType::half); };
 
-            expectQ (0_bp, 0_bp);
-            expectQ (0.1_bp, 0.5_bp);
-            expectQ (0.5_bp, 0.5_bp);
+            expectQ (0_bp,      0_bp);
 
-            expectQ (0.9_bp, 1_bp);
-            expectQ (1.0_bp, 1_bp);
+            expectQ (0.1_bp,    2_bp);
+            expectQ (1_bp,      2_bp);
+            expectQ (1.5_bp,    2_bp);
+            expectQ (2_bp,      2_bp);
 
-            expectQ (1.1_bp, 1.5_bp);
-            expectQ (1.5_bp, 1.5_bp);
+            expectQ (3_bp,      4_bp);
+            expectQ (4_bp,      4_bp);
 
-            expectQ (1.9_bp, 2_bp);
-            expectQ (2.0_bp, 2_bp);
+            expectQ (5_bp,      6_bp);
+            expectQ (6_bp,      6_bp);
+
+            expectQ (7_bp,      8_bp);
+            expectQ (8_bp,      8_bp);
+
+            expectQ (8.01_bp,   10_bp);
+            expectQ (9_bp,      10_bp);
         }
 
         beginTest ("Quarter");
         {
             auto expectQ = [&] (auto c, auto n) { expectNext (c, n, LaunchQType::quarter); };
 
             expectQ (0_bp, 0_bp);
-            expectQ (0.1_bp, 0.25_bp);
-            expectQ (0.5_bp, 0.5_bp);
-            expectQ (0.6_bp, 0.75_bp);
 
+            expectQ (0.1_bp, 1_bp);
+            expectQ (0.5_bp, 1_bp);
+            expectQ (0.6_bp, 1_bp);
             expectQ (0.9_bp, 1_bp);
             expectQ (1.0_bp, 1_bp);
 
-            expectQ (1.1_bp, 1.25_bp);
-            expectQ (1.5_bp, 1.5_bp);
-
+            expectQ (1.1_bp, 2_bp);
+            expectQ (1.5_bp, 2_bp);
             expectQ (1.9_bp, 2_bp);
             expectQ (2.0_bp, 2_bp);
+
+            expectQ (2.1_bp, 3_bp);
+            expectQ (2.9_bp, 3_bp);
+
+            expectQ (3.1_bp, 4_bp);
+            expectQ (3.9_bp, 4_bp);
         }
     }
 };