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

Messy attempt to make the spectral module enabled parameters be tied to particular modules, this needs to be seriously examined...

Browse Source
This commit is contained in:
xenakios
2018-04-26 21:45:37 +03:00
parent 40fcc1bdb0
commit cd15a0ea48
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/PS_Source/ProcessedStretch.h
View File

@ -486,6 +486,8 @@ public:
inline void swapSpectrumProcesses(SpectrumProcess& a, SpectrumProcess& b)
{
std::swap(a, b);
return;
bool aenab = *b.m_enabled;
bool benab = *a.m_enabled;
std::swap(a.m_index, b.m_index);

20
Source/PS_Source/StretchSource.cpp
View File

@ -16,7 +16,10 @@ StretchAudioSource::StretchAudioSource(int initialnumoutchans,
m_resampler_outbuf.resize(1024*1024);
m_inputfile = std::make_unique<AInputS>(m_afm);
for (int i = 0; i < enab_pars.size(); ++i)
{
m_specproc_order.emplace_back(i, enab_pars[i]);
m_specprocmap[i] = i;
}
//m_specproc_order = { {0,false} , { 1, false} ,{2,true},{3,true},{4,true},{5,false},{6,true},{7,true},{8,false} };
setNumOutChannels(initialnumoutchans);
m_xfadetask.buffer.setSize(8, 65536);
@ -71,6 +74,9 @@ std::vector<SpectrumProcess> StretchAudioSource::getSpectrumProcessOrder()
void StretchAudioSource::setSpectrumProcessOrder(std::vector<SpectrumProcess> order)
{
ScopedLock locker(m_cs);
m_specprocmap.clear();
for (int i = 0; i < order.size(); ++i)
m_specprocmap[i] = order[i].m_index;
m_specproc_order = order;
for (int i = 0; i < m_stretchers.size(); ++i)
{
@ -166,17 +172,13 @@ void StretchAudioSource::setMainVolume(double decibels)
void StretchAudioSource::setSpectralModulesEnabled(const std::array<AudioParameterBool*, 9>& params)
{
jassert(m_specprocmap.size() > 0);
/*
jassert(params.size() == m_specproc_order.size());
std::set<AudioParameterBool*> foo;
for (auto& e : params)
foo.insert(e);
jassert(foo.size() == params.size());
*/
bool changed = false;
for (int i = 0; i < m_specproc_order.size(); ++i)
{
if (*params[i] != *m_specproc_order[i].m_enabled)
int index = m_specprocmap[i];
if (*params[index] != *m_specproc_order[i].m_enabled)
{
changed = true;
break;
@ -184,11 +186,13 @@ void StretchAudioSource::setSpectralModulesEnabled(const std::array<AudioParamet
}
if (changed == false)
return;
*/
if (m_cs.tryEnter())
{
for (int i = 0; i < m_specproc_order.size(); ++i)
{
*m_specproc_order[i].m_enabled = (bool)(*params[i]);
int index = m_specprocmap[i];
*m_specproc_order[i].m_enabled = (bool)(*params[index]);
}
for (int i = 0; i < m_stretchers.size(); ++i)
{

1
Source/PS_Source/StretchSource.h
View File

@ -142,6 +142,7 @@ private:
std::vector<double> m_resampler_outbuf;
CriticalSection m_cs;
std::vector<SpectrumProcess> m_specproc_order;
std::unordered_map<int, int> m_specprocmap;
bool m_stop_play_requested = false;
double m_freeze_pos = 0.0;
int64_t m_output_counter = 0;