comparison audioio/AudioCallbackPlaySource.cpp @ 15:cc566264c935

* timestretcher improvements -- simplify API (it can calculate its own
  processing block sizes etc)

 {
 //    std::cerr << "TimeStretcherData::TimeStretcherData(" << channels << ", " << factor << ", " << blockSize << ")" << std::endl;
 
     for (size_t ch = 0; ch < channels; ++ch) {
 
-	m_stretcher[ch] = StretcherBuffer
-//!!!
-	    (new PhaseVocoderTimeStretcher(factor,
-                                      blockSize,
+	m_stretcher[ch] = new PhaseVocoderTimeStretcher(factor, blockSize);
 //                                      128),
-                                      (blockSize/2) / factor),
-	     new float[lrintf(blockSize * factor)]);
-    }
-    m_stretchInputBuffer = new float[blockSize];
+//                                      (blockSize/2) / factor),
+//	     new float[lrintf(blockSize * factor)]);
+    }
 }
 
 AudioCallbackPlaySource::TimeStretcherData::~TimeStretcherData()
 {
 //    std::cerr << "TimeStretcherData::~TimeStretcherData" << std::endl;
 
     while (!m_stretcher.empty()) {
-	delete m_stretcher.begin()->second.first;
-	delete[] m_stretcher.begin()->second.second;
+	delete m_stretcher.begin()->second;
+//	delete[] m_stretcher.begin()->second.second;
 	m_stretcher.erase(m_stretcher.begin());
     }
-    delete m_stretchInputBuffer;
+//    delete m_stretchInputBuffer;
 }
 
 PhaseVocoderTimeStretcher *
 AudioCallbackPlaySource::TimeStretcherData::getStretcher(size_t channel)
 {
-    return m_stretcher[channel].first;
-}
-
+    return m_stretcher[channel];
+}
+/*
 float *
 AudioCallbackPlaySource::TimeStretcherData::getOutputBuffer(size_t channel)
 {
     return m_stretcher[channel].second;
 }

 {
     getStretcher(channel)->process(getInputBuffer(),
 				   getOutputBuffer(channel),
 				   m_blockSize);
 }
-
+*/
 void
 AudioCallbackPlaySource::setSlowdownFactor(float factor)
 {
     // Avoid locks -- create, assign, mark old one for scavenging
     // later (as a call to getSourceSamples may still be using it)

 	TimeStretcherData *newStretcher = new TimeStretcherData
 	    (getTargetChannelCount(), factor,
 //             factor > 1 ? getTargetBlockSize() : getTargetBlockSize() / factor);
              //!!! doesn't work if the block size > getTargetBlockSize(), but it
              // should be made to
-             getTargetBlockSize());
+//             getTargetBlockSize());
+             lrintf(getTargetBlockSize() / factor));
 	m_slowdownCounter = 0;
 	m_timeStretcher = newStretcher;
     } else {
 	m_timeStretcher = 0;
     }