midi notes avaiable on ui
This commit is contained in:
@ -67,14 +67,17 @@ static inline bool float_equal(float one, float two) {
|
||||
return abs(one - two) < 1e-5f;
|
||||
}
|
||||
|
||||
void Shifter::Init()
|
||||
void Shifter::Init(float samplerate, int samplesPerBlock)
|
||||
{
|
||||
sample_rate_ = samplerate;
|
||||
blocksize = samplesPerBlock;
|
||||
out_midi_smoother.SetFrameTime((float)samplesPerBlock / samplerate);
|
||||
volume = 1;
|
||||
helm.setframesize(1024);
|
||||
helm.setoverlap(1);
|
||||
for (int i = 0; i < MAX_VOICES; ++i)
|
||||
{
|
||||
voices[i].Init(48000);
|
||||
voices[i].Init(samplerate);
|
||||
}
|
||||
for (int i = 0; i < BUFFER_SIZE; ++i)
|
||||
{
|
||||
@ -148,13 +151,13 @@ void Shifter::DetectPitch(const float* const* in, float** out, size_t size)
|
||||
// Smoothly filter in_period changes
|
||||
in_period = in_period * in_period_filter_amount + period * (1.0f - in_period_filter_amount);
|
||||
}
|
||||
float in_freq = 48000 / in_period;
|
||||
float in_freq = sample_rate_ / in_period;
|
||||
|
||||
float midi = (12 * log2f(in_freq / 440) + 69.0f);
|
||||
|
||||
//target_out_period = in_period * out_period_filter_amount + target_out_period * (1 - out_period_filter_amount);
|
||||
out_midi = out_midi_smoother.update(midi, (int)(midi+.5));
|
||||
out_period = 48000.0f / mtof(out_midi);
|
||||
out_period = sample_rate_ / mtof(out_midi);
|
||||
}
|
||||
|
||||
void Shifter::SetRates() {}
|
||||
@ -275,8 +278,8 @@ void Shifter::GetSamples(float** output, const float* input, size_t size)
|
||||
//add new samples if necessary
|
||||
for (int out_p = 0; out_p < MAX_VOICES; ++out_p)
|
||||
{
|
||||
voices[out_p].Process();
|
||||
if (!voices[out_p].IsActive()) continue;
|
||||
voices[out_p].Process();
|
||||
if (voices[out_p].PeriodOverflow())
|
||||
{
|
||||
float resampling_period = GetOutputEnvelopePeriod(out_p);
|
||||
@ -328,12 +331,12 @@ void Shifter::GetSamples(float** output, const float* input, size_t size)
|
||||
|
||||
void Shifter::AddMidiNote(int note) {
|
||||
for (int i = 0; i < MAX_VOICES; ++i) {
|
||||
if (voices[i].IsActive() && voices[i].GetMidiNote() == note) {
|
||||
return;
|
||||
if (voices[i].onoff_ && voices[i].GetMidiNote() == note) {
|
||||
voices[i].Release();
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < MAX_VOICES; ++i) {
|
||||
if (!voices[i].IsActive()) {
|
||||
if (!voices[i].onoff_) {
|
||||
voices[i].Trigger(note);
|
||||
return;
|
||||
}
|
||||
@ -343,9 +346,8 @@ void Shifter::AddMidiNote(int note) {
|
||||
|
||||
void Shifter::RemoveMidiNote(int note) {
|
||||
for (int i = 0; i < MAX_VOICES; ++i) {
|
||||
if (voices[i].IsActive() && voices[i].GetMidiNote() == note) {
|
||||
if (voices[i].GetMidiNote() == note) {
|
||||
voices[i].Release();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user