Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement fade in to prevent Triple Osc from clicking #5199

Merged
merged 12 commits into from
May 19, 2020
+100 −4
Merged

Implement fade in to prevent Triple Osc from clicking #5199

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
22770d7
Implement Fade In
necrashter Sep 19, 2019
e645bd6
Combine for loops, follow coding conventions
necrashter Sep 20, 2019
47eccd0
New coding convention
necrashter Sep 21, 2019
9c92b4c
Remove underscore
necrashter Sep 22, 2019
aac6fe1
New way of detecting zero point crossings
necrashter Sep 23, 2019
26361dc
use tabs
necrashter Sep 23, 2019
cc9cead
Support for shorter buffer sizes
necrashter Sep 29, 2019
1b07852
Add comments
necrashter Oct 14, 2019
78cd54e
Smoother Transition
necrashter Nov 2, 2019
1cd3ccb
offset fix
necrashter Dec 22, 2019
38a649d
use camelCase, style fix
necrashter Apr 23, 2020
69bef07
Apply suggestions from code review
necrashter Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/Instrument.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class LMMS_EXPORT Instrument : public Plugin

protected:
// fade in to prevent clicks
void applyFadeIn( sampleFrame * buf, const NotePlayHandle * _n );
void applyFadeIn(sampleFrame * buf, const NotePlayHandle * _n);
necrashter marked this conversation as resolved.
Show resolved Hide resolved

// instruments may use this to apply a soft fade out at the end of
// notes - method does this only if really less or equal
Expand Down
2 changes: 1 addition & 1 deletion plugins/triple_oscillator/TripleOscillator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ void TripleOscillator::playNote( NotePlayHandle * _n,
osc_l->update( _working_buffer + offset, frames, 0 );
osc_r->update( _working_buffer + offset, frames, 1 );

applyFadeIn( _working_buffer, _n );
applyFadeIn(_working_buffer, _n);
applyRelease( _working_buffer, _n );

instrumentTrack()->processAudioBuffer( _working_buffer, frames + offset, _n );
Expand Down
20 changes: 10 additions & 10 deletions src/core/Instrument.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ bool Instrument::isFromTrack( const Track * _track ) const
}


void Instrument::applyFadeIn( sampleFrame * buf, const NotePlayHandle * n )
void Instrument::applyFadeIn(sampleFrame * buf, const NotePlayHandle * n)
{
// apply only if it's the start of the note
if (n->totalFramesPlayed() == 0)
Expand All @@ -96,15 +96,15 @@ void Instrument::applyFadeIn( sampleFrame * buf, const NotePlayHandle * n )
int max_zc = 0;

// determine the zero point crossing counts
for ( fpp_t f = 0; f < frames; ++f )
for (fpp_t f = 0; f < frames; ++f)
{
for ( ch_cnt_t ch=0; ch < DEFAULT_CHANNELS; ++ch )
for (ch_cnt_t ch=0; ch < DEFAULT_CHANNELS; ++ch)
{
if ( ( buf[f-1][ch] < 0.0 && buf[f][ch] > 0.0 ) ||
( buf[f-1][ch] > 0.0 && buf[f][ch] < 0.0 ) )
if ((buf[f-1][ch] < 0.0 && buf[f][ch] > 0.0) ||
(buf[f-1][ch] > 0.0 && buf[f][ch] < 0.0))
{
++zero_crossings[ch];
if ( zero_crossings[ch] > max_zc )
if (zero_crossings[ch] > max_zc)
{
max_zc = zero_crossings[ch];
}
Expand All @@ -114,13 +114,13 @@ void Instrument::applyFadeIn( sampleFrame * buf, const NotePlayHandle * n )

// calculate the length of the fade in
fpp_t length = (fpp_t) (
( (float)frames - 1 ) /
( (float)max_zc / 2.0f + 1.0f ) / 3.0f );
((float)frames - 1) /
((float)max_zc / 2.0f + 1.0f) / 3.0f);

// apply fade in
for ( fpp_t f = 0; f < length; ++f )
for (fpp_t f = 0; f < length; ++f)
{
for ( ch_cnt_t ch = 0; ch < DEFAULT_CHANNELS; ++ch )
for (ch_cnt_t ch = 0; ch < DEFAULT_CHANNELS; ++ch)
{
buf[f][ch] *= 0.5 - 0.5 * cosf(F_PI * (float) f / (float) length);
}
Expand Down