1 files changed, 8 insertions, 11 deletions

diff --git a/Camera.h b/Camera.h
index d9d02f0..6ff3045 100644
--- a/Camera.h
+++ b/Camera.h
@@ -5,7 +5,9 @@
  *  Includes
  * *************************************/
 
+#include "Cursor.h"
 #include <stdint.h>
+#include <stdbool.h>
 
 /* *************************************
  *  Defines
@@ -23,26 +25,21 @@ class Camera
 {
     public:
         Camera(void);
-        void handler(void);
-        void setLock(const bool bLock)
-        {
-            _bLocked = bLock;
-        }
+        void adjustLock(const bool bLock);
+        bool isLocked(void) const;
         uint8_t getX(const uint8_t x) const;
         uint8_t getY(const uint8_t y) const;
 
         /* Event handlers. */
-        void onLeftBtnPressed(void);
-        void onRightBtnPressed(void);
-        void onUpBtnPressed(void);
-        void onDownBtnPressed(void);
+        void onLeftBtnPressed(Cursor& cursor);
+        void onRightBtnPressed(Cursor& cursor);
+        void onUpBtnPressed(Cursor& cursor);
+        void onDownBtnPressed(Cursor& cursor);
 
     private:
         bool _bLocked;
         int16_t _xOffset;
         int16_t _yOffset;
-        int16_t _xSpeed;
-        int16_t _ySpeed;
         uint8_t _speedTimer;
 };