From 16b3902ec1c297887cad0b574a175f0e7a0c9ed8 Mon Sep 17 00:00:00 2001 From: szeli1 Date: Fri, 3 Nov 2023 20:49:11 +0100 Subject: [PATCH 1/4] fixed AudioFileProcessor reverse bug --- plugins/AudioFileProcessor/AudioFileProcessor.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/plugins/AudioFileProcessor/AudioFileProcessor.cpp b/plugins/AudioFileProcessor/AudioFileProcessor.cpp index 6671022070c..f1b70dc5b47 100644 --- a/plugins/AudioFileProcessor/AudioFileProcessor.cpp +++ b/plugins/AudioFileProcessor/AudioFileProcessor.cpp @@ -1160,14 +1160,25 @@ void AudioFileProcessorWaveView::slideSampleByFrames( f_cnt_t _frames ) return; } const double v = static_cast( _frames ) / m_sampleBuffer.frames(); + //update knobs in the right order + //to avoid them clamping each other + bool updateBefore = false; + if (m_loopKnob && m_startKnob && m_endKnob && + (m_loopKnob->model()->value() < m_startKnob->model()->value() + v || + m_loopKnob->model()->value() > m_endKnob->model()->value() + v)) + { + updateBefore = true; + m_loopKnob->slideBy(v, false); + } if( m_startKnob ) { m_startKnob->slideBy( v, false ); } if( m_endKnob ) { m_endKnob->slideBy( v, false ); } - if( m_loopKnob ) { - m_loopKnob->slideBy( v, false ); + if (m_loopKnob && updateBefore==false) + { + m_loopKnob->slideBy(v, false); } } From 72d92a6315b37e469f1dd8351ca03f2b719f2a97 Mon Sep 17 00:00:00 2001 From: szeli1 Date: Sat, 11 Nov 2023 12:14:51 +0100 Subject: [PATCH 2/4] AudioFileProcessor_reversebug_knobs_fixed --- .../AudioFileProcessor/AudioFileProcessor.cpp | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/plugins/AudioFileProcessor/AudioFileProcessor.cpp b/plugins/AudioFileProcessor/AudioFileProcessor.cpp index f1b70dc5b47..36da188e200 100644 --- a/plugins/AudioFileProcessor/AudioFileProcessor.cpp +++ b/plugins/AudioFileProcessor/AudioFileProcessor.cpp @@ -1162,23 +1162,35 @@ void AudioFileProcessorWaveView::slideSampleByFrames( f_cnt_t _frames ) const double v = static_cast( _frames ) / m_sampleBuffer.frames(); //update knobs in the right order //to avoid them clamping each other - bool updateBefore = false; - if (m_loopKnob && m_startKnob && m_endKnob && - (m_loopKnob->model()->value() < m_startKnob->model()->value() + v || - m_loopKnob->model()->value() > m_endKnob->model()->value() + v)) + if (v < 0) { - updateBefore = true; - m_loopKnob->slideBy(v, false); - } - if( m_startKnob ) { - m_startKnob->slideBy( v, false ); - } - if( m_endKnob ) { - m_endKnob->slideBy( v, false ); + if (m_startKnob) + { + m_startKnob->slideBy(v, false); + } + if (m_loopKnob) + { + m_loopKnob->slideBy(v, false); + } + if (m_endKnob) + { + m_endKnob->slideBy(v, false); + } } - if (m_loopKnob && updateBefore==false) + else { - m_loopKnob->slideBy(v, false); + if (m_endKnob) + { + m_endKnob->slideBy(v, false); + } + if (m_loopKnob) + { + m_loopKnob->slideBy(v, false); + } + if (m_startKnob) + { + m_startKnob->slideBy(v, false); + } } } From 8588cc06c1cfddf0b0892bb543d973d77e96f5fe Mon Sep 17 00:00:00 2001 From: szeli1 Date: Sat, 25 Nov 2023 17:19:51 +0100 Subject: [PATCH 3/4] audioFileProcessor_style_changes --- plugins/AudioFileProcessor/AudioFileProcessor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/AudioFileProcessor/AudioFileProcessor.cpp b/plugins/AudioFileProcessor/AudioFileProcessor.cpp index 36da188e200..20a5b4ea22e 100644 --- a/plugins/AudioFileProcessor/AudioFileProcessor.cpp +++ b/plugins/AudioFileProcessor/AudioFileProcessor.cpp @@ -1160,8 +1160,8 @@ void AudioFileProcessorWaveView::slideSampleByFrames( f_cnt_t _frames ) return; } const double v = static_cast( _frames ) / m_sampleBuffer.frames(); - //update knobs in the right order - //to avoid them clamping each other + // update knobs in the right order + // to avoid them clamping each other if (v < 0) { if (m_startKnob) From cbe3f29ae228bc7073fd7fbdf9fd21cca506cf07 Mon Sep 17 00:00:00 2001 From: szeli1 Date: Sat, 25 Nov 2023 22:51:36 +0100 Subject: [PATCH 4/4] audioFileProcessor_simplified_changes --- .../AudioFileProcessor/AudioFileProcessor.cpp | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/plugins/AudioFileProcessor/AudioFileProcessor.cpp b/plugins/AudioFileProcessor/AudioFileProcessor.cpp index 20a5b4ea22e..30b166735bb 100644 --- a/plugins/AudioFileProcessor/AudioFileProcessor.cpp +++ b/plugins/AudioFileProcessor/AudioFileProcessor.cpp @@ -1164,33 +1164,15 @@ void AudioFileProcessorWaveView::slideSampleByFrames( f_cnt_t _frames ) // to avoid them clamping each other if (v < 0) { - if (m_startKnob) - { - m_startKnob->slideBy(v, false); - } - if (m_loopKnob) - { - m_loopKnob->slideBy(v, false); - } - if (m_endKnob) - { - m_endKnob->slideBy(v, false); - } + m_startKnob->slideBy(v, false); + m_loopKnob->slideBy(v, false); + m_endKnob->slideBy(v, false); } else { - if (m_endKnob) - { - m_endKnob->slideBy(v, false); - } - if (m_loopKnob) - { - m_loopKnob->slideBy(v, false); - } - if (m_startKnob) - { - m_startKnob->slideBy(v, false); - } + m_endKnob->slideBy(v, false); + m_loopKnob->slideBy(v, false); + m_startKnob->slideBy(v, false); } }