allanger/paulxstretch
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 2 Activity

Propagate host provided maximum block size to buffering audio source

Browse Source
This commit is contained in:
xenakios 2017-12-14 19:06:26 +02:00
parent a3c2a07e5b
commit 40096fc87d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/PluginProcessor.cpp
View File

@ -210,7 +210,7 @@ void PaulstretchpluginAudioProcessor::setFFTSize(double size)
//Logger::writeToLog(String(m_fft_size_to_use)); //Logger::writeToLog(String(m_fft_size_to_use));
} }
void PaulstretchpluginAudioProcessor::startplay(Range<double> playrange, int numoutchans, String& err) void PaulstretchpluginAudioProcessor::startplay(Range<double> playrange, int numoutchans, int maxBlockSize, String& err)
{ {
m_stretch_source->setPlayRange(playrange, true); m_stretch_source->setPlayRange(playrange, true);
@ -231,12 +231,13 @@ void PaulstretchpluginAudioProcessor::startplay(Range<double> playrange, int num
m_stretch_source->setProcessParameters(&m_ppar); m_stretch_source->setProcessParameters(&m_ppar);
m_last_outpos_pos = 0.0; m_last_outpos_pos = 0.0;
m_last_in_pos = playrange.getStart()*m_stretch_source->getInfileLengthSeconds(); m_last_in_pos = playrange.getStart()*m_stretch_source->getInfileLengthSeconds();
m_buffering_source->prepareToPlay(1024, getSampleRate()); m_buffering_source->prepareToPlay(maxBlockSize, getSampleRate());
}; };
void PaulstretchpluginAudioProcessor::prepareToPlay(double sampleRate, int samplesPerBlock) void PaulstretchpluginAudioProcessor::prepareToPlay(double sampleRate, int samplesPerBlock)
{ {
ScopedLock locker(m_cs); ScopedLock locker(m_cs);
m_curmaxblocksize = samplesPerBlock;
int numoutchans = *m_outchansparam; int numoutchans = *m_outchansparam;
if (numoutchans != m_cur_num_out_chans) if (numoutchans != m_cur_num_out_chans)
m_ready_to_play = false; m_ready_to_play = false;
@ -255,7 +256,7 @@ void PaulstretchpluginAudioProcessor::prepareToPlay(double sampleRate, int sampl
String err; String err;
startplay({ *getFloatParameter(5),*getFloatParameter(6) }, startplay({ *getFloatParameter(5),*getFloatParameter(6) },
numoutchans, err); numoutchans, samplesPerBlock, err);
m_cur_num_out_chans = numoutchans; m_cur_num_out_chans = numoutchans;
m_ready_to_play = true; m_ready_to_play = true;
} }
@ -527,13 +528,14 @@ void PaulstretchpluginAudioProcessor::timerCallback(int id)
} }
if (m_cur_num_out_chans != *m_outchansparam) if (m_cur_num_out_chans != *m_outchansparam)
{ {
jassert(m_curmaxblocksize > 0);
ScopedLock locker(m_cs); ScopedLock locker(m_cs);
m_ready_to_play = false; m_ready_to_play = false;
m_cur_num_out_chans = *m_outchansparam; m_cur_num_out_chans = *m_outchansparam;
//Logger::writeToLog("Switching to use " + String(m_cur_num_out_chans) + " out channels"); //Logger::writeToLog("Switching to use " + String(m_cur_num_out_chans) + " out channels");
String err; String err;
startplay({ *getFloatParameter(cpi_soundstart),*getFloatParameter(cpi_soundend) }, startplay({ *getFloatParameter(cpi_soundstart),*getFloatParameter(cpi_soundend) },
m_cur_num_out_chans, err); m_cur_num_out_chans, m_curmaxblocksize, err);
m_ready_to_play = true; m_ready_to_play = true;
} }
} }

3
Source/PluginProcessor.h
View File

@ -125,9 +125,10 @@ private:
ProcessParameters m_ppar; ProcessParameters m_ppar;
void setPreBufferAmount(int x); void setPreBufferAmount(int x);
void setFFTSize(double size); void setFFTSize(double size);
void startplay(Range<double> playrange, int numoutchans, String& err); void startplay(Range<double> playrange, int numoutchans, int maxBlockSize, String& err);
SharedResourcePointer<MyThumbCache> m_thumbcache; SharedResourcePointer<MyThumbCache> m_thumbcache;
AudioParameterInt* m_outchansparam = nullptr; AudioParameterInt* m_outchansparam = nullptr;
int m_curmaxblocksize = 0;
//============================================================================== //==============================================================================
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PaulstretchpluginAudioProcessor) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PaulstretchpluginAudioProcessor)
}; };