-Fixed naming issue

This commit is contained in:
Harry van Haaren 2013-05-19 02:39:06 +01:00
parent a08118b4f1
commit 44396b5ed9
3 changed files with 13 additions and 13 deletions

View file

@ -12,10 +12,10 @@ using namespace std;
// this is a wrapper class around a vector of Controller instances
// Call the method on this class, and all controllers will be updated
class ControllerUpdator
class ControllerUpdater
{
public:
ControllerUpdator()
ControllerUpdater()
{
c.push_back( new AkaiAPC() );
}

View file

@ -46,7 +46,7 @@ class Jack
Metronome* getMetronome(){return &metronome;}
TimeManager* getTimeManager(){return &timeManager;}
ControllerUpdator* getControllerUpdator(){return &controllerUpdator;}
ControllerUpdater* getControllerUpdater(){return &controllerUpdater;}
void writeApcOutput( unsigned char* data );
@ -55,7 +55,7 @@ class Jack
Metronome metronome;
TimeManager timeManager;
ControllerUpdator controllerUpdator;
ControllerUpdater controllerUpdater;
vector<Looper*> loopers;

View file

@ -86,36 +86,36 @@ void Looper::updateControllers()
if (state == STATE_RECORD_QUEUED )
{
numBeats = 0;
jack->getControllerUpdator()->recordArm(track, true);
jack->getControllerUpdator()->clipSelect(track, currentClip, Controller::CLIP_MODE_RECORD_QUEUED);
jack->getControllerUpdater()->recordArm(track, true);
jack->getControllerUpdater()->clipSelect(track, currentClip, Controller::CLIP_MODE_RECORD_QUEUED);
}
else if (state == STATE_RECORDING )
{
jack->getControllerUpdator()->recordArm(track, true);
jack->getControllerUpdator()->clipSelect(track, currentClip, Controller::CLIP_MODE_RECORDING);
jack->getControllerUpdater()->recordArm(track, true);
jack->getControllerUpdater()->clipSelect(track, currentClip, Controller::CLIP_MODE_RECORDING);
}
else
{
jack->getControllerUpdator()->recordArm(track, false);
jack->getControllerUpdater()->recordArm(track, false);
}
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 )
{
jack->getControllerUpdator()->clipSelect(track, currentClip, Controller::CLIP_MODE_PLAYING);
jack->getControllerUpdater()->clipSelect(track, currentClip, Controller::CLIP_MODE_PLAYING);
}
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 )
{
jack->getControllerUpdator()->clipSelect(track, currentClip, Controller::CLIP_MODE_LOADED);
jack->getControllerUpdater()->clipSelect(track, currentClip, Controller::CLIP_MODE_LOADED);
}
}