comparison audioio/ClipMixer.cpp @ 311:86fb9160d122 tonioni

Fix some foolish mistakes. We have arbitrary frequency note playback now (though with rough edges)

 
 float
 ClipMixer::getResampleRatioFor(float frequency)
 {
     if (!m_clipData) return 1.0;
-    float pitchRatio = frequency / m_clipF0;
+    float pitchRatio = m_clipF0 / frequency;
     float resampleRatio = m_sampleRate / m_clipRate;
     return pitchRatio * resampleRatio;
 }
 
 int

         }
 
         int clipDuration = getResampledClipDuration(note.frequency);
         if (start + clipDuration > 0) {
             if (start < 0 && start + clipDuration < durationHere) {
-                durationHere = clipDuration - start;
+                durationHere = start + clipDuration;
             }
             if (durationHere > 0) {
                 mixNote(toBuffers,
                         levels,
                         note.frequency,

         if (osi + 1 < m_clipLength) {
             value += (m_clipData[osi + 1] - m_clipData[osi]) * (os - osi);
         }
         
         for (int c = 0; c < m_channels; ++c) {
-            toBuffers[c][targetOffset + i] = levels[c] * value;
-        }
-    }
-}
-
-
+            toBuffers[c][targetOffset + i] += levels[c] * value;
+        }
+    }
+}
+
+