From 44396b5ed907d1525491d1c27277c4a38342db9f Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Sun, 19 May 2013 02:39:06 +0100 Subject: [PATCH] -Fixed naming issue --- src/controllerupdater.hxx | 4 ++-- src/jack.hxx | 4 ++-- src/looper.cxx | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/controllerupdater.hxx b/src/controllerupdater.hxx index 0b2e263..e6f0e36 100644 --- a/src/controllerupdater.hxx +++ b/src/controllerupdater.hxx @@ -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() ); } diff --git a/src/jack.hxx b/src/jack.hxx index c7d2c4a..b0282ff 100644 --- a/src/jack.hxx +++ b/src/jack.hxx @@ -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 loopers; diff --git a/src/looper.cxx b/src/looper.cxx index 48007a0..c646560 100644 --- a/src/looper.cxx +++ b/src/looper.cxx @@ -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); } }