comparison VampTestPlugin.cpp @ 8:8c3a61d37984

Use fractional sample rates for FixedSampleRate outputs (a better test); fix failure to deliver enough columns in grid-fsr

     d.hasFixedBinCount = true;
     d.binCount = 1;
     d.hasKnownExtents = false;
     d.isQuantized = false;
     d.sampleType = OutputDescriptor::FixedSampleRate;
-    d.sampleRate = 2;
+    d.sampleRate = 2.5;
     d.hasDuration = false;
     m_outputNumbers[d.identifier] = n++;
     list.push_back(d);
 
     d.identifier = "curve-fsr-timed";

     d.hasFixedBinCount = true;
     d.binCount = 1;
     d.hasKnownExtents = false;
     d.isQuantized = false;
     d.sampleType = OutputDescriptor::FixedSampleRate;
-    d.sampleRate = 2;
+    d.sampleRate = 2.5;
     d.hasDuration = false;
     m_outputNumbers[d.identifier] = n++;
     list.push_back(d);
 
     d.identifier = "curve-vsr";

     d.hasFixedBinCount = true;
     d.binCount = 10;
     d.hasKnownExtents = false;
     d.isQuantized = false;
     d.sampleType = OutputDescriptor::FixedSampleRate;
-    d.sampleRate = 2;
+    d.sampleRate = 2.5;
     d.hasDuration = false;
     m_outputNumbers[d.identifier] = n++;
     list.push_back(d);
 
     d.identifier = "notes-regions";

 		.push_back(untimedCurveValue(timestamp, m_n, 20));
 	}
 
 	if (m_n < 5) {
 	    fs[m_outputNumbers["curve-fsr"]]
-		.push_back(untimedCurveValue(RealTime::fromSeconds(m_n / 2.0), m_n, 10));
+		.push_back(untimedCurveValue(RealTime::fromSeconds(m_n / 2.5), m_n, 10));
 
 	    float s = (m_n / 4) * 2;
 	    if ((m_n % 4) > 0) {
 		s += float((m_n % 4) - 1) / 6.0;
 	    }
 	    fs[m_outputNumbers["curve-fsr-timed"]]
 		.push_back(snappedCurveValue(RealTime::fromSeconds(s),
-					     RealTime::fromSeconds(snap(s, 0.5)),
+					     RealTime::fromSeconds(snap(s, 0.4)),
 					     m_n, 10));
 	}
 
 	if (m_n < 20) {
 	    fs[m_outputNumbers["grid-oss"]]

 
     } else {
 
 	for (int i = (m_n > 5 ? 5 : m_n); i < 10; ++i) {
 	    fs[m_outputNumbers["curve-fsr"]]
-		.push_back(untimedCurveValue(RealTime::fromSeconds(i / 2.0), i, 10));
+		.push_back(untimedCurveValue(RealTime::fromSeconds(i / 2.5), i, 10));
 
 	    float s = (i / 4) * 2;
 	    if ((i % 4) > 0) {
 		s += float((i % 4) - 1) / 6.0;
 	    }
 	    fs[m_outputNumbers["curve-fsr-timed"]]
 		.push_back(snappedCurveValue(RealTime::fromSeconds(s),
-					     RealTime::fromSeconds(snap(s, 0.5)),
+					     RealTime::fromSeconds(snap(s, 0.4)),
 					     i, 10));
 	}
 
-	for (int i = (m_n > 5 ? 5 : m_n); i < 10; ++i) {
+	for (int i = 0; i < 10; ++i) {
 	    fs[m_outputNumbers["grid-fsr"]]
 		.push_back(gridColumn(RealTime::fromSeconds(i / 2.0), i, 10));
 	}
     }