hiro/openAV-Luppp
1
0
Fork 0
mirror of https://github.com/vale981/openAV-Luppp synced 2025-03-05 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

-Updated jack output logic, mix volume doesn't affect sidechainging, fixed some prints

Browse source
This commit is contained in:
Harry van Haaren 2013-08-16 13:14:47 +01:00
parent e517b9246a
commit 32674a703a
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/avtk/avtk_clip_selector.h
View file

@ -136,10 +136,10 @@ class ClipSelector : public Fl_Button
case GridLogic::STATE_LOADED:
clips[clipNum].load();
clips[clipNum].unqueue();
printf("clipSelector setState() clip %i = STATE_LOADED\n", clipNum);
//printf("clipSelector setState() clip %i = STATE_LOADED\n", clipNum);
break;
case GridLogic::STATE_PLAYING:
printf("clipSelector setState() clip %i = STATE_PLAYING\n", clipNum);
//printf("clipSelector setState() clip %i = STATE_PLAYING\n", clipNum);
for(int i = 0; i < numClips; i++ )
clips[clipNum].stop();
clips[clipNum].unqueue();
@ -149,20 +149,20 @@ class ClipSelector : public Fl_Button
for(int i = 0; i < numClips; i++ )
clips[clipNum].unqueue();
clips[clipNum].queue();
printf("clipSelector setState() clip %i = STATE_PLAY_QUEUED\n", clipNum);
//printf("clipSelector setState() clip %i = STATE_PLAY_QUEUED\n", clipNum);
break;
case GridLogic::STATE_RECORDING:
for(int i = 0; i < numClips; i++ )
clips[clipNum].stopRecord();
clips[clipNum].unqueue();
clips[clipNum].record();
printf("clipSelector setState() clip %i = STATE_RECORDING\n", clipNum);
//printf("clipSelector setState() clip %i = STATE_RECORDING\n", clipNum);
break;
case GridLogic::STATE_RECORD_QUEUED:
for(int i = 0; i < numClips; i++ )
clips[clipNum].unqueue();
clips[clipNum].queue();
printf("clipSelector setState() clip %i = STATE_RECORD_QUEUED\n", clipNum);
//printf("clipSelector setState() clip %i = STATE_RECORD_QUEUED\n", clipNum);
break;
/*
case GridLogic::STATE_STOPPED:
@ -171,7 +171,7 @@ class ClipSelector : public Fl_Button
break;
*/
case GridLogic::STATE_STOP_QUEUED:
printf("clipSelector setState() clip %i = STATE_STOP_QUEUED\n", clipNum);
//printf("clipSelector setState() clip %i = STATE_STOP_QUEUED\n", clipNum);
clips[clipNum].stopRecord();
clips[clipNum].stop();
clips[clipNum].queue();

5
src/gridlogic.cxx
View file

@ -61,13 +61,14 @@ void GridLogic::load(int track, int scene)
void GridLogic::updateState()
{
printf("GridLogic::updateState() stub" );
//printf("GridLogic::updateState() stub" );
}
void GridLogic::bar()
{
printf("GridLogic::bar()\n" );
EventGuiPrint e( "GridLogic::bar()\n" );
writeToGuiRingbuffer( &e );
/// iterate over all clips, if they're set to QUEUED, set to the next state
for( int i = 0; i < NTRACKS*NSCENES; i++ )

4
src/looperclip.cxx
View file

@ -129,7 +129,9 @@ float LooperClip::getSample(float playSpeed)
_playhead < 0 )
{
_playhead = 0;
printf("looper resetting playhead\n");
EventGuiPrint e( "LooperClip resetting _playhead" );
writeToGuiRingbuffer( &e );
}
std::vector<float>& v = _buffer->getData();

5
src/trackoutput.cxx
View file

@ -90,8 +90,11 @@ void TrackOutput::process(unsigned int nframes, Buffers* buffers)
masterR[i] += tmp * _toMaster * (1-_toPostSidechain);
reverb[i] += tmp * _toReverb * _toMaster;
sidechain[i] += tmp * _toSidechain * _toMaster;
postSidechain[i] += tmp * _toPostSidechain * _toMaster;
// turning down an element in the mix should *NOT* influence sidechaining
sidechain[i] += tmp * _toSidechain;
}
}