mirror of
https://github.com/vale981/openAV-Luppp
synced 2025-03-05 09:01:39 -05:00
-Fixed naming issue
This commit is contained in:
parent
a08118b4f1
commit
44396b5ed9
3 changed files with 13 additions and 13 deletions
|
@ -12,10 +12,10 @@ using namespace std;
|
||||||
|
|
||||||
// this is a wrapper class around a vector of Controller instances
|
// this is a wrapper class around a vector of Controller instances
|
||||||
// Call the method on this class, and all controllers will be updated
|
// Call the method on this class, and all controllers will be updated
|
||||||
class ControllerUpdator
|
class ControllerUpdater
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ControllerUpdator()
|
ControllerUpdater()
|
||||||
{
|
{
|
||||||
c.push_back( new AkaiAPC() );
|
c.push_back( new AkaiAPC() );
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,7 @@ class Jack
|
||||||
|
|
||||||
Metronome* getMetronome(){return &metronome;}
|
Metronome* getMetronome(){return &metronome;}
|
||||||
TimeManager* getTimeManager(){return &timeManager;}
|
TimeManager* getTimeManager(){return &timeManager;}
|
||||||
ControllerUpdator* getControllerUpdator(){return &controllerUpdator;}
|
ControllerUpdater* getControllerUpdater(){return &controllerUpdater;}
|
||||||
|
|
||||||
void writeApcOutput( unsigned char* data );
|
void writeApcOutput( unsigned char* data );
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ class Jack
|
||||||
Metronome metronome;
|
Metronome metronome;
|
||||||
TimeManager timeManager;
|
TimeManager timeManager;
|
||||||
|
|
||||||
ControllerUpdator controllerUpdator;
|
ControllerUpdater controllerUpdater;
|
||||||
|
|
||||||
vector<Looper*> loopers;
|
vector<Looper*> loopers;
|
||||||
|
|
||||||
|
|
|
@ -86,36 +86,36 @@ void Looper::updateControllers()
|
||||||
if (state == STATE_RECORD_QUEUED )
|
if (state == STATE_RECORD_QUEUED )
|
||||||
{
|
{
|
||||||
numBeats = 0;
|
numBeats = 0;
|
||||||
jack->getControllerUpdator()->recordArm(track, true);
|
jack->getControllerUpdater()->recordArm(track, true);
|
||||||
jack->getControllerUpdator()->clipSelect(track, currentClip, Controller::CLIP_MODE_RECORD_QUEUED);
|
jack->getControllerUpdater()->clipSelect(track, currentClip, Controller::CLIP_MODE_RECORD_QUEUED);
|
||||||
}
|
}
|
||||||
else if (state == STATE_RECORDING )
|
else if (state == STATE_RECORDING )
|
||||||
{
|
{
|
||||||
jack->getControllerUpdator()->recordArm(track, true);
|
jack->getControllerUpdater()->recordArm(track, true);
|
||||||
jack->getControllerUpdator()->clipSelect(track, currentClip, Controller::CLIP_MODE_RECORDING);
|
jack->getControllerUpdater()->clipSelect(track, currentClip, Controller::CLIP_MODE_RECORDING);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
jack->getControllerUpdator()->recordArm(track, false);
|
jack->getControllerUpdater()->recordArm(track, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state == STATE_PLAY_QUEUED )
|
if (state == STATE_PLAY_QUEUED )
|
||||||
{
|
{
|
||||||
jack->getControllerUpdator()->clipSelect(track, currentClip, Controller::CLIP_MODE_PLAY_QUEUED);
|
jack->getControllerUpdater()->clipSelect(track, currentClip, Controller::CLIP_MODE_PLAY_QUEUED);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( state == STATE_PLAYING )
|
if ( state == STATE_PLAYING )
|
||||||
{
|
{
|
||||||
jack->getControllerUpdator()->clipSelect(track, currentClip, Controller::CLIP_MODE_PLAYING);
|
jack->getControllerUpdater()->clipSelect(track, currentClip, Controller::CLIP_MODE_PLAYING);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state == STATE_STOP_QUEUED )
|
if (state == STATE_STOP_QUEUED )
|
||||||
{
|
{
|
||||||
jack->getControllerUpdator()->clipSelect(track, currentClip, Controller::CLIP_MODE_LOADED);
|
jack->getControllerUpdater()->clipSelect(track, currentClip, Controller::CLIP_MODE_LOADED);
|
||||||
}
|
}
|
||||||
else if ( state == STATE_STOPPED )
|
else if ( state == STATE_STOPPED )
|
||||||
{
|
{
|
||||||
jack->getControllerUpdator()->clipSelect(track, currentClip, Controller::CLIP_MODE_LOADED);
|
jack->getControllerUpdater()->clipSelect(track, currentClip, Controller::CLIP_MODE_LOADED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue