add simple envelope to stop popping
This commit is contained in:
@@ -10,11 +10,10 @@ Instrument::Instrument(ConfigService* config, LoggerService* logger) :
|
||||
|
||||
void Instrument::noteOn(float frequency, float velocity) {
|
||||
|
||||
// std::string msg = "NoteOn Frequency = " + std::to_string(frequency);
|
||||
// if(logger_ != nullptr) logger_->log("Instrument", LogFlag::Debug, msg);
|
||||
|
||||
phaseIncrement_ = 2.0f * pi * frequency / sampleRate_;
|
||||
|
||||
envelope_ += 0.01f; // so it triggers as active
|
||||
|
||||
active_ = true;
|
||||
}
|
||||
|
||||
@@ -23,14 +22,18 @@ void Instrument::noteOff() {
|
||||
}
|
||||
|
||||
bool Instrument::isActive() {
|
||||
return active_;
|
||||
return (envelope_ > 0.0f);
|
||||
}
|
||||
|
||||
float Instrument::process(bool& scopeTrigger) {
|
||||
|
||||
if(active_ && envelope_ < 1.0f) envelope_ += 0.01f;
|
||||
if(!active_ && envelope_ > 0.0f) envelope_ -= 0.01f;
|
||||
|
||||
phase_ += phaseIncrement_;
|
||||
if(phase_ > 2.0f * pi) phase_ -= 2.0f * pi;
|
||||
|
||||
return sin(phase_);
|
||||
if(!isActive()) return 0.0f;
|
||||
return sin(phase_) * envelope_;
|
||||
|
||||
}
|
||||
|
||||
@@ -32,5 +32,6 @@ private:
|
||||
static constexpr float pi = 3.14159265358979323846f;
|
||||
float phase_ = 0.0f;
|
||||
float phaseIncrement_ = 0.0f;
|
||||
float envelope_ = 0.0f;
|
||||
|
||||
};
|
||||
|
||||
@@ -45,7 +45,7 @@ void Synth::process(float* out, size_t nFrames) {
|
||||
float mix = 0.0f;
|
||||
for(size_t j = 0; j < voices_.size(); j++) {
|
||||
bool temp = false;
|
||||
if(!voices_[j].isActive()) continue;
|
||||
//if(!voices_[j].isActive()) continue;
|
||||
mix += voices_[j].process(temp);
|
||||
// if(j == lowestVoice) triggered = temp;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user