From a2e154a8becbf0222d805fb283c48993acb95762 Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Mon, 27 Mar 2017 21:14:53 +0100 Subject: [PATCH] restyled looper and looperclip --- src/looper.cxx | 9 ++++----- src/looperclip.cxx | 19 +++++++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/looper.cxx b/src/looper.cxx index c9b7f28..71af0d9 100644 --- a/src/looper.cxx +++ b/src/looper.cxx @@ -136,8 +136,8 @@ void Looper::process(unsigned int nframes, Buffers* buffers) for(unsigned int i = 0; i < nframes; i++ ) { // REFACTOR into system that is better than per sample function calls - float tmpL = 0; - float tmpR = 0; + float tmpL = 0; + float tmpR = 0; clips[clip]->getSample(playSpeed, &tmpL, &tmpR); float deltaPitch = 12 * log ( playSpeed ) / log (2); @@ -149,11 +149,10 @@ void Looper::process(unsigned int nframes, Buffers* buffers) if(playSpeed!=1.0f) { pitchShift( 1, &tmpL, &outL[i] ); pitchShift( 1, &tmpR, &outR[i] ); - } - else { + } else { outL[i]+=tmpL; outR[i]+=tmpR; - } + } } //printf("Looper %i playing(), speed = %f\n", track, playSpeed ); diff --git a/src/looperclip.cxx b/src/looperclip.cxx index 8dce9ff..e193c6a 100644 --- a/src/looperclip.cxx +++ b/src/looperclip.cxx @@ -157,7 +157,7 @@ void LooperClip::recieveSaveBuffer( AudioBuffer* saveBuffer ) if ( saveBuffer->getSize() >= _buffer->getDataL().at(0) || saveBuffer->getSize() >= _buffer->getDataR().at(0) ) { // copy current contents into save buffer, - // getData() contains L and R buffer, so twice the size is needed + // getData() contains L and R buffer, so twice the size is needed size_t framesBySize = _buffer->getAudioFrames(); memcpy( &saveBuffer->getDataL().at(0), &_buffer->getDataL().at(0), sizeof(float)*framesBySize); memcpy( &saveBuffer->getDataR().at(0), &_buffer->getDataR().at(0), sizeof(float)*framesBySize); @@ -223,7 +223,7 @@ void LooperClip::record(int count, float* L, float* R) unsigned long LooperClip::recordSpaceAvailable() { if ( _buffer ) - // getData() contains L and R buffer, so it is twice the size + // getData() contains L and R buffer, so it is twice the size return _buffer->getSize() - _recordhead; return 0; @@ -428,16 +428,15 @@ void LooperClip::getSample(float playSpeed, float* L, float* R) //writeToGuiRingbuffer( &e ); } - std::vector& vL = _buffer->getDataL(); - std::vector& vR = _buffer->getDataR(); - *L = vL.at(_playhead); - *R = vR.at(_playhead); + std::vector& vL = _buffer->getDataL(); + std::vector& vR = _buffer->getDataR(); + *L = vL.at(_playhead); + *R = vR.at(_playhead); _playhead +=playSpeed; + } else { + *L = 0.f; + *R = 0.f; } - else { - *L = 0.f; - *R = 0.f; - } } float LooperClip::getProgress()