From 45840b652769d212893f936815cc85abc099b164 Mon Sep 17 00:00:00 2001
From: SergioMartin86 <eienburuu@gmail.com>
Date: Tue, 19 Mar 2024 19:47:30 +0100
Subject: [PATCH] Putting controller into its own namespace

---
 source/controller.hpp             |  8 +++++++-
 source/nesInstanceBase.hpp        | 20 ++++++++++----------
 source/quickNES/nesInstance.hpp   |  2 +-
 source/quickerNES/nesInstance.hpp |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/source/controller.hpp b/source/controller.hpp
index 5498e2f..ab2b063 100644
--- a/source/controller.hpp
+++ b/source/controller.hpp
@@ -7,6 +7,9 @@
 #include <string>
 #include <sstream>
 
+namespace quickNES
+{
+
 class Controller
 {
 public:
@@ -204,4 +207,7 @@ public:
   input_t _input;
   controller_t _controller1Type;
   controller_t _controller2Type;
-};
+  
+}; // class Controller
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/nesInstanceBase.hpp b/source/nesInstanceBase.hpp
index 1f2d692..acbfbd2 100644
--- a/source/nesInstanceBase.hpp
+++ b/source/nesInstanceBase.hpp
@@ -38,10 +38,10 @@ class NESInstanceBase
   {
     bool isTypeRecognized = false;
 
-    if (type == "None") { _controller.setController1Type(Controller::controller_t::none); isTypeRecognized = true; }
-    if (type == "Joypad") { _controller.setController1Type(Controller::controller_t::joypad); isTypeRecognized = true; }
-    if (type == "FourScore1") { _controller.setController1Type(Controller::controller_t::fourscore1); isTypeRecognized = true; }
-    if (type == "FourScore2") { _controller.setController1Type(Controller::controller_t::fourscore2); isTypeRecognized = true; }
+    if (type == "None") { _controller.setController1Type(quickNES::Controller::controller_t::none); isTypeRecognized = true; }
+    if (type == "Joypad") { _controller.setController1Type(quickNES::Controller::controller_t::joypad); isTypeRecognized = true; }
+    if (type == "FourScore1") { _controller.setController1Type(quickNES::Controller::controller_t::fourscore1); isTypeRecognized = true; }
+    if (type == "FourScore2") { _controller.setController1Type(quickNES::Controller::controller_t::fourscore2); isTypeRecognized = true; }
 
     if (isTypeRecognized == false) JAFFAR_THROW_LOGIC("Input type not recognized: '%s'\n", type.c_str());
   }
@@ -50,10 +50,10 @@ class NESInstanceBase
   {
     bool isTypeRecognized = false;
 
-    if (type == "None") { _controller.setController2Type(Controller::controller_t::none); isTypeRecognized = true; }
-    if (type == "Joypad") { _controller.setController2Type(Controller::controller_t::joypad); isTypeRecognized = true; }
-    if (type == "FourScore1") { _controller.setController2Type(Controller::controller_t::fourscore1); isTypeRecognized = true; }
-    if (type == "FourScore2") { _controller.setController2Type(Controller::controller_t::fourscore2); isTypeRecognized = true; }
+    if (type == "None") { _controller.setController2Type(quickNES::Controller::controller_t::none); isTypeRecognized = true; }
+    if (type == "Joypad") { _controller.setController2Type(quickNES::Controller::controller_t::joypad); isTypeRecognized = true; }
+    if (type == "FourScore1") { _controller.setController2Type(quickNES::Controller::controller_t::fourscore1); isTypeRecognized = true; }
+    if (type == "FourScore2") { _controller.setController2Type(quickNES::Controller::controller_t::fourscore2); isTypeRecognized = true; }
     
     if (isTypeRecognized == false) JAFFAR_THROW_LOGIC("Input type not recognized: '%s'\n", type.c_str());
   }
@@ -112,7 +112,7 @@ class NESInstanceBase
   virtual void enableStateBlockImpl(const std::string& block) = 0;
   virtual void disableStateBlockImpl(const std::string& block) = 0;
   virtual bool loadROMImpl(const uint8_t* romData, const size_t romSize) = 0;
-  virtual void advanceStateImpl(const Controller::port_t controller1, const Controller::port_t controller2) = 0;
+  virtual void advanceStateImpl(const quickNES::Controller::port_t controller1, const quickNES::Controller::port_t controller2) = 0;
 
   // Storage for the light state size
   size_t _stateSize;
@@ -123,5 +123,5 @@ class NESInstanceBase
   private:
 
   // Controller class for input parsing
-  Controller _controller;
+  quickNES::Controller _controller;
 };
diff --git a/source/quickNES/nesInstance.hpp b/source/quickNES/nesInstance.hpp
index 4cc7e51..e2a1f4d 100644
--- a/source/quickNES/nesInstance.hpp
+++ b/source/quickNES/nesInstance.hpp
@@ -74,7 +74,7 @@ class NESInstance final : public NESInstanceBase
   void enableStateBlockImpl(const std::string& block) override {};
   void disableStateBlockImpl(const std::string& block) override {};
 
-  void advanceStateImpl(const Controller::port_t controller1, const Controller::port_t controller2) override
+  void advanceStateImpl(const quickNES::Controller::port_t controller1, const quickNES::Controller::port_t controller2) override
   {
     if (_doRendering == true) _nes.emulate_frame(controller1, controller2);
     if (_doRendering == false) _nes.emulate_skip_frame(controller1, controller2);
diff --git a/source/quickerNES/nesInstance.hpp b/source/quickerNES/nesInstance.hpp
index 85b6332..580c29f 100644
--- a/source/quickerNES/nesInstance.hpp
+++ b/source/quickerNES/nesInstance.hpp
@@ -59,7 +59,7 @@ class NESInstance final : public NESInstanceBase
 
   void enableStateBlockImpl(const std::string& block) override { _nes.enableStateBlock(block); };
   void disableStateBlockImpl(const std::string& block) override { _nes.disableStateBlock(block); };
-  void advanceStateImpl(const Controller::port_t controller1, const Controller::port_t controller2) override
+  void advanceStateImpl(const quickNES::Controller::port_t controller1, const quickNES::Controller::port_t controller2) override
   {
     if (_doRendering == true) _nes.emulate_frame(controller1, controller2);
     if (_doRendering == false) _nes.emulate_skip_frame(controller1, controller2);