comparison audioio/ContinuousSynth.cpp @ 315:65b75e23bbd5 tonioni

interpolation, longer crossfades

     if (!nowOn && !wasOn) {
 	m_phase = 0;
 	return;
     }
 
-    int fadeLength = 20; // samples
+    int fadeLength = 100; // samples
 
     float *levels = new float[m_channels];
     
     for (int c = 0; c < m_channels; ++c) {
 	levels[c] = gain;

     if (pan != 0.0 && m_channels == 2) {
 	levels[0] *= 1.0 - pan;
 	levels[1] *= pan + 1.0;
     }
 
-    double phasor = (f0 * 2 * M_PI) / m_sampleRate;
-    double p = m_phase;
-
-    cerr << "ContinuousSynth::mix: f0 = " << f0 << " (from " << m_prevF0 << "), phase = " << m_phase << ", phasor = " << phasor << endl;
+//    cerr << "ContinuousSynth::mix: f0 = " << f0 << " (from " << m_prevF0 << "), phase = " << m_phase << endl;
 
     for (int i = 0; i < m_blockSize; ++i) {
 
-	p = m_phase + i * phasor;
+        double fHere = (nowOn ? f0 : m_prevF0);
+
+        if (wasOn && nowOn && (f0 != m_prevF0) && (i < fadeLength)) {
+            // interpolate the frequency shift
+            fHere = m_prevF0 + ((f0 - m_prevF0) * i) / fadeLength;
+        }
+
+        double phasor = (fHere * 2 * M_PI) / m_sampleRate;
+    
+//        cerr << "phasor = " << phasor << endl;
+        
+	m_phase = m_phase + phasor;
 	
-	double v = sin(p);
+	double v = sin(m_phase);
 
-	if (!wasOn && i < fadeLength) { // fade in
+	if (!wasOn && i < fadeLength) {
+            // fade in
 	    v = v * (i / double(fadeLength));
 	} else if (!nowOn) {
+            // fade out
 	    if (i > fadeLength) v = 0;
 	    else v = v * (1.0 - (i / double(fadeLength)));
 	}
 
 	for (int c = 0; c < m_channels; ++c) {
 	    toBuffers[c][i] += levels[c] * v;
 	}
     }	
 
     m_prevF0 = f0;
-    m_phase = p;
 
     delete[] levels;
 }