From b67cfffe5f580a6af49e59b4f8faea48b0f8a845 Mon Sep 17 00:00:00 2001 From: Oskar Wallgren Date: Sun, 29 Jul 2018 15:34:46 +0200 Subject: [PATCH] InstrumentFunctions - Arpeggiator code refactoring (#4487) --- src/core/InstrumentFunctions.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp index a2aecb9c9..70e2c5e80 100644 --- a/src/core/InstrumentFunctions.cpp +++ b/src/core/InstrumentFunctions.cpp @@ -349,6 +349,8 @@ void InstrumentFunctionArpeggio::processNote( NotePlayHandle * _n ) return; } + // Set master note if not playing arp note or it will play as an ordinary note + _n->setMasterNote(); const int selected_arp = m_arpModel.value(); @@ -401,8 +403,6 @@ void InstrumentFunctionArpeggio::processNote( NotePlayHandle * _n ) if( m_arpModeModel.value() == SortMode && ( ( cur_frame / arp_frames ) % total_range ) / range != (f_cnt_t) _n->index() ) { - // Set master note if not playing arp note or it will play as an ordinary note - _n->setMasterNote(); // update counters frames_processed += arp_frames; cur_frame += arp_frames; @@ -414,9 +414,6 @@ void InstrumentFunctionArpeggio::processNote( NotePlayHandle * _n ) { if( 100 * ( (float) rand() / (float)( RAND_MAX + 1.0f ) ) < m_arpSkipModel.value() ) { - // Set master note to prevent the note to extend over skipped notes - // This may only be needed for lb302 - _n->setMasterNote(); // update counters frames_processed += arp_frames; cur_frame += arp_frames; @@ -517,13 +514,6 @@ void InstrumentFunctionArpeggio::processNote( NotePlayHandle * _n ) frames_processed += arp_frames; cur_frame += arp_frames; } - - // make sure note is handled as arp-base-note, even - // if we didn't add a sub-note so far - if( m_arpModeModel.value() != FreeMode ) - { - _n->setMasterNote(); - } }