Soundship
/
Loopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jacksendreturn: fix whitespace issues and cleanup 

No code functionality changes here

Signed-off-by: Harry van Haaren <harryhaaren@gmail.com>
main
Harry van Haaren 2018-03-02 00:10:41 +00:00
parent 5692d5123d
commit 683f80027c
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/jacksendreturn.cxx
View File

@ -36,10 +36,12 @@ void JackSendReturn::process(unsigned int nframes, Buffers *buffers)
//Process previous AudioProcessor //Process previous AudioProcessor
m_previousProcessor->process(nframes,buffers); m_previousProcessor->process(nframes,buffers);
float* sendL=(float*)jack_port_get_buffer(m_sendport_l,(jack_nframes_t)(buffers->nframes));
float* sendR=(float*)jack_port_get_buffer(m_sendport_r,(jack_nframes_t)(buffers->nframes)); float* sendL=(float*)jack_port_get_buffer(m_sendport_l, (jack_nframes_t)(buffers->nframes));
float* retL=(float*)jack_port_get_buffer(m_returnport_l,(jack_nframes_t)(buffers->nframes)); float* sendR=(float*)jack_port_get_buffer(m_sendport_r, (jack_nframes_t)(buffers->nframes));
float* retR=(float*)jack_port_get_buffer(m_returnport_r,(jack_nframes_t)(buffers->nframes)); float* retL =(float*)jack_port_get_buffer(m_returnport_l,(jack_nframes_t)(buffers->nframes));
float* retR =(float*)jack_port_get_buffer(m_returnport_r,(jack_nframes_t)(buffers->nframes));
if(offset) { if(offset) {
sendL+=offset; sendL+=offset;
sendR+=offset; sendR+=offset;
@ -50,11 +52,7 @@ void JackSendReturn::process(unsigned int nframes, Buffers *buffers)
for(int i=0; i<nframes; i++) { for(int i=0; i<nframes; i++) {
sendL[i]=m_sendvol*sendtrackL[i]; sendL[i]=m_sendvol*sendtrackL[i];
sendR[i]=m_sendvol*sendtrackR[i]; sendR[i]=m_sendvol*sendtrackR[i];
} }
// if(nframes!=buffers->nframes)
// {
// cout<<send<<endl;
// }
if(offset) if(offset)
assert(offset+nframes==buffers->nframes); assert(offset+nframes==buffers->nframes);
@ -62,13 +60,11 @@ void JackSendReturn::process(unsigned int nframes, Buffers *buffers)
if(m_active) { if(m_active) {
memcpy(rettrackL,retL,nframes*sizeof(float)); memcpy(rettrackL,retL,nframes*sizeof(float));
memcpy(rettrackR,retR,nframes*sizeof(float)); memcpy(rettrackR,retR,nframes*sizeof(float));
} }
else { else {
memcpy(rettrackL, memcpy(rettrackL, sendtrackL,nframes*sizeof(float));
sendtrackL,nframes*sizeof(float)); memcpy(rettrackR, sendtrackR,nframes*sizeof(float));
memcpy(rettrackR, }
sendtrackR,nframes*sizeof(float));
}
m_counter+=nframes; m_counter+=nframes;
} }

2
src/looper.cxx
View File

@ -146,7 +146,7 @@ void Looper::process(unsigned int nframes, Buffers* buffers)
// write the pitch-shifted signal to the track buffer // write the pitch-shifted signal to the track buffer
//FIXME: pitchShift adds delay even for playSpeed = 1.0!! //FIXME: pitchShift adds delay even for playSpeed = 1.0!!
//we should use something better (e.g librubberband) //we should use something better (e.g librubberband)
if(playSpeed!=1.0f) { if(0) { //playSpeed!=1.0f) {
pitchShift( 1, &tmpL, &outL[i] ); pitchShift( 1, &tmpL, &outL[i] );
pitchShift( 1, &tmpR, &outR[i] ); pitchShift( 1, &tmpR, &outR[i] );
} else { } else {