Cleanup of keyboard recorder path.

Author: Mysticial

SerialPrograms/Source/Controllers/Controller.cpp

@@ -5,12 +5,37 @@
  */
 
 #include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
 #include "Controller.h"
 
 namespace PokemonAutomation{
 
 
 
+
+struct AbstractController::Data{
+    ListenerSet<InputSniffer> input_sniffers;
+};
+void AbstractController::add_input_sniffer(InputSniffer& listener){
+    m_data->input_sniffers.add(listener);
+}
+void AbstractController::remove_input_sniffer(InputSniffer& listener){
+    m_data->input_sniffers.remove(listener);
+}
+void AbstractController::on_command_input(WallClock timestamp, const ControllerState& state){
+    m_data->input_sniffers.run_method(&InputSniffer::on_command_input, timestamp, state);
+}
+
+
+AbstractController::AbstractController()
+    : m_data(CONSTRUCT_TOKEN)
+{}
+AbstractController::~AbstractController() = default;
+
+
+
+
 void AbstractController::throw_bad_cast(const char* desired_typename){
     throw UserSetupError(
         logger(),

SerialPrograms/Source/Controllers/Controller.h

@@ -10,13 +10,14 @@
 #include "Common/Compiler.h"
 #include "Common/Cpp/AbstractLogger.h"
 #include "Common/Cpp/Time.h"
-#include "Controllers/KeyboardInput/KeyboardEventHandler.h"
+#include "Common/Cpp/Containers/Pimpl.h"
 #include "Common/Cpp/CancellableScope.h"
 
 namespace PokemonAutomation{
 
 class RecursiveThrottler;
 class ControllerInputState;
+class ControllerState;
 enum class ControllerType;
 enum class ControllerPerformanceClass;
 enum class ControllerClass;
@@ -28,7 +29,8 @@ class AbstractController{
 public:
     static const char NAME[];
 
-    virtual ~AbstractController() = default;
+    AbstractController();
+    virtual ~AbstractController();
 
     virtual Logger& logger() = 0;
     virtual RecursiveThrottler& logging_throttler() = 0;
@@ -196,8 +198,18 @@ class AbstractController{
 
     virtual void run_controller_input(const ControllerInputState& state){}
 
-    virtual void add_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){};
-    virtual void remove_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){};
+    struct InputSniffer{
+        virtual void on_command_input(WallClock timestamp, const ControllerState& state) = 0;
+    };
+    void add_input_sniffer(InputSniffer& listener);
+    void remove_input_sniffer(InputSniffer& listener);
+protected:
+    void on_command_input(WallClock timestamp, const ControllerState& state);
+
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
 };
 
 

SerialPrograms/Source/Controllers/KeyboardInput/KeyboardEventHandler.cpp

@@ -129,7 +129,7 @@ void Keyboard::run_controller_input(const ControllerInputState& state){
         std::vector<KeyboardKey>(lstate.keys().begin(), lstate.keys().end())
     );
 
-//    m_data->m_input_sniffer.report_keyboard_command_sent(timestamp, controller_state);
+//    on_command_input(timestamp, controller_state);
 }
 
 

SerialPrograms/Source/Controllers/KeyboardInput/KeyboardEventHandler.h

@@ -38,7 +38,6 @@ const char RightJoycon::NAME[] = "Nintendo Switch: Right Joycon";
 
 struct JoyconController::Data{
     std::map<KeyboardKey, JoyconDeltas> m_keyboard_mapping;
-    KeyboardEventHandler m_input_sniffer;
 };
 
 
@@ -95,14 +94,7 @@ void JoyconController::run_controller_input(const ControllerInputState& state){
         controller_state.joystick_y
     );
 
-    m_data->m_input_sniffer.report_keyboard_command_sent(timestamp, controller_state);
-}
-
-void JoyconController::add_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){
-    m_data->m_input_sniffer.add_listener(listener);
-}
-void JoyconController::remove_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){
-    m_data->m_input_sniffer.remove_listener(listener);
+    on_command_input(timestamp, controller_state);
 }
 
 

SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp

@@ -168,9 +168,6 @@ class JoyconController : public AbstractController{
 
     virtual void run_controller_input(const ControllerInputState& state) override;
 
-    virtual void add_input_sniffer(KeyboardEventHandler::KeyboardListener& listener) override;
-    virtual void remove_input_sniffer(KeyboardEventHandler::KeyboardListener& listener) override;
-
 
 private:
     struct Data;

SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp

@@ -37,7 +37,6 @@ const char ProController::NAME[] = "Nintendo Switch: Pro Controller";
 
 struct ProController::Data{
     std::map<KeyboardKey, ProControllerDeltas> m_keyboard_mapping;
-    KeyboardEventHandler m_input_sniffer;
 };
 
 
@@ -100,14 +99,7 @@ void ProController::run_controller_input(const ControllerInputState& state){
         controller_state.right_y
     );
 
-    m_data->m_input_sniffer.report_keyboard_command_sent(timestamp, controller_state);
-}
-
-void ProController::add_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){
-    m_data->m_input_sniffer.add_listener(listener);
-}
-void ProController::remove_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){
-    m_data->m_input_sniffer.remove_listener(listener);
+    on_command_input(timestamp, controller_state);
 }
 
 

SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h

@@ -223,8 +223,6 @@ class ProController : public AbstractController{
 
     virtual void run_controller_input(const ControllerInputState& state) override;
 
-    virtual void add_input_sniffer(KeyboardEventHandler::KeyboardListener& listener) override;
-    virtual void remove_input_sniffer(KeyboardEventHandler::KeyboardListener& listener) override;
 
 private:
     struct Data;

SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp

@@ -338,28 +338,19 @@ JsonValue RecordKeyboardController::controller_history_to_json(Logger& logger, C
 }
 
 
-void RecordKeyboardController::on_keyboard_command_sent(WallClock time_stamp, const ControllerState& state){
+void RecordKeyboardController::on_command_input(WallClock timestamp, const ControllerState& state){
     cout << "keyboard_command_sent" << endl;
     JsonValue serialized_state = state.to_json();
     cout << serialized_state.dump(0) << endl;
-    
+
     ControllerStateSnapshot state_snapshot = {
-        time_stamp,
+        timestamp,
         std::move(serialized_state)
     };
     m_controller_history.emplace_back(std::move(state_snapshot));
 }
-void RecordKeyboardController::on_keyboard_command_stopped(WallClock time_stamp){
-    cout << "keyboard_command_stopped" << endl;
-    JsonObject obj;
-//    obj["is_neutral"] = true;
 
-    ControllerStateSnapshot state_snapshot = {
-        time_stamp, 
-        std::move(obj)
-    };
-    m_controller_history.emplace_back(std::move(state_snapshot));
-}
+