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

Use enum for spectral processing module type

Browse Source
This commit is contained in:
xenakios
2018-11-11 14:06:18 +02:00
parent b5a106f0b0
commit 605852d853
4 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/PS_Source/ProcessedStretch.cpp
View File

@@ -30,8 +30,6 @@ ProcessedStretch::ProcessedStretch(REALTYPE rap_,int in_bufsize_,FFTWindow w,boo
ProcessedStretch::~ProcessedStretch() ProcessedStretch::~ProcessedStretch()
{ {
// delete [] fbfreq;
}; };
void ProcessedStretch::set_parameters(ProcessParameters *ppar) void ProcessedStretch::set_parameters(ProcessParameters *ppar)
@@ -56,7 +54,6 @@ void ProcessedStretch::setBufferSize(int sz)
m_sumfreq = floatvector(nfreq); m_sumfreq = floatvector(nfreq);
m_tmpfreq1 = floatvector(nfreq); m_tmpfreq1 = floatvector(nfreq);
m_tmpfreq2 = floatvector(nfreq); m_tmpfreq2 = floatvector(nfreq);
//fbfreq=new REALTYPE[nfreq];
m_free_filter_freqs = floatvector(nfreq); m_free_filter_freqs = floatvector(nfreq);
fill_container(m_free_filter_freqs, 1.0f); fill_container(m_free_filter_freqs, 1.0f);
} }
@@ -104,25 +101,23 @@ void ProcessedStretch::process_spectrum(REALTYPE *freq)
for (auto& e : m_spectrum_processes) for (auto& e : m_spectrum_processes)
{ {
spectrum_copy(nfreq, freq, m_infreq.data()); spectrum_copy(nfreq, freq, m_infreq.data());
if (e.m_index == 0 && *e.m_enabled == true) if (e.m_index == SPT_Harmonics && *e.m_enabled == true)
spectrum_do_harmonics(pars, m_tmpfreq1, nfreq, samplerate, m_infreq.data(), freq); spectrum_do_harmonics(pars, m_tmpfreq1, nfreq, samplerate, m_infreq.data(), freq);
if (e.m_index == 1 && *e.m_enabled == true) if (e.m_index == SPT_TonalVsNoise && *e.m_enabled == true)
spectrum_do_tonal_vs_noise(pars,nfreq,samplerate,m_tmpfreq1, m_infreq.data(), freq); spectrum_do_tonal_vs_noise(pars,nfreq,samplerate,m_tmpfreq1, m_infreq.data(), freq);
if (e.m_index == 2 && *e.m_enabled == true) if (e.m_index == SPT_FreqShift && *e.m_enabled == true)
spectrum_do_freq_shift(pars,nfreq,samplerate,m_infreq.data(), freq); spectrum_do_freq_shift(pars,nfreq,samplerate,m_infreq.data(), freq);
if (e.m_index == 3 && *e.m_enabled == true) if (e.m_index == SPT_PitchShift && *e.m_enabled == true)
spectrum_do_pitch_shift(pars,nfreq,m_infreq.data(), freq, pow(2.0f, pars.pitch_shift.cents / 1200.0f)); spectrum_do_pitch_shift(pars,nfreq,m_infreq.data(), freq, pow(2.0f, pars.pitch_shift.cents / 1200.0f));
//if (e.m_index == 4 && *e.m_enabled == true) if (e.m_index == SPT_RatioMix && *e.m_enabled == true)
// spectrum_do_octave(pars,nfreq,samplerate, m_sumfreq, m_tmpfreq1, m_infreq.data(), freq);
if (e.m_index == 4 && *e.m_enabled == true)
spectrum_do_ratiomix(pars,nfreq,samplerate, m_sumfreq, m_tmpfreq1, m_infreq.data(), freq); spectrum_do_ratiomix(pars,nfreq,samplerate, m_sumfreq, m_tmpfreq1, m_infreq.data(), freq);
if (e.m_index == 5 && *e.m_enabled == true) if (e.m_index == SPT_Spread && *e.m_enabled == true)
spectrum_spread(nfreq,samplerate,m_tmpfreq1,m_infreq.data(), freq, pars.spread.bandwidth); spectrum_spread(nfreq,samplerate,m_tmpfreq1,m_infreq.data(), freq, pars.spread.bandwidth);
if (e.m_index == 6 && *e.m_enabled == true) if (e.m_index == SPT_Filter && *e.m_enabled == true)
spectrum_do_filter(pars,nfreq,samplerate,m_infreq.data(), freq); spectrum_do_filter(pars,nfreq,samplerate,m_infreq.data(), freq);
if (e.m_index == 8 && *e.m_enabled == true) if (e.m_index == SPT_Compressor && *e.m_enabled == true)
spectrum_do_compressor(pars,nfreq, m_infreq.data(), freq); spectrum_do_compressor(pars,nfreq, m_infreq.data(), freq);
if (e.m_index == 7 && *e.m_enabled == true) if (e.m_index == SPT_FreeFilter && *e.m_enabled == true)
spectrum_do_free_filter(m_free_filter_envelope, nfreq, samplerate, m_infreq.data(), freq); spectrum_do_free_filter(m_free_filter_envelope, nfreq, samplerate, m_infreq.data(), freq);
} }
}; };

17
Source/PS_Source/ProcessedStretch.h
View File

@@ -471,13 +471,26 @@ inline void spectrum_do_free_filter(shared_envelope& env, int nfreq, double samp
}; };
}; };
enum SpectrumProcessType
{
SPT_Harmonics = 0,
SPT_TonalVsNoise,
SPT_FreqShift,
SPT_PitchShift,
SPT_RatioMix,
SPT_Spread,
SPT_Filter,
SPT_FreeFilter,
SPT_Compressor,
SPT_Unknown = 1000
};
class SpectrumProcess class SpectrumProcess
{ {
public: public:
SpectrumProcess() {} SpectrumProcess() {}
SpectrumProcess(int index, AudioParameterBool* enabled) : m_index(index), m_enabled(enabled) {} SpectrumProcess(SpectrumProcessType index, AudioParameterBool* enabled) : m_index(index), m_enabled(enabled) {}
int m_index = -1; SpectrumProcessType m_index = SPT_Unknown;
AudioParameterBool* m_enabled = nullptr; AudioParameterBool* m_enabled = nullptr;
}; };

2
Source/PS_Source/StretchSource.cpp
View File

@@ -35,7 +35,7 @@ StretchAudioSource::StretchAudioSource(int initialnumoutchans,
m_inputfile = std::make_unique<AInputS>(m_afm); m_inputfile = std::make_unique<AInputS>(m_afm);
for (int i = 0; i < enab_pars.size(); ++i) for (int i = 0; i < enab_pars.size(); ++i)
{ {
m_specproc_order.emplace_back(i, enab_pars[i]); m_specproc_order.emplace_back((SpectrumProcessType)i, enab_pars[i]);
} }
//m_specproc_order = { {0,false} , { 1, false} ,{2,true},{3,true},{4,true},{5,false},{6,true},{7,true},{8,false} }; //m_specproc_order = { {0,false} , { 1, false} ,{2,true},{3,true},{4,true},{5,false},{6,true},{7,true},{8,false} };
setNumOutChannels(initialnumoutchans); setNumOutChannels(initialnumoutchans);

2
Source/PluginProcessor.cpp
View File

@@ -291,7 +291,7 @@ void PaulstretchpluginAudioProcessor::setStateFromTree(ValueTree tree)
for (int i = 0; i < ordersize; ++i) for (int i = 0; i < ordersize; ++i)
{ {
int index = tree.getProperty("specorderb" + String(i)); int index = tree.getProperty("specorderb" + String(i));
new_order.push_back({ index, old_order[index].m_enabled }); new_order.push_back({ (SpectrumProcessType)index, old_order[index].m_enabled });
} }
m_stretch_source->setSpectrumProcessOrder(new_order); m_stretch_source->setSpectrumProcessOrder(new_order);
} }