Minor refactor.

Author: Mysticial

SerialPrograms/Source/Controllers/ControllerState.cpp

@@ -26,7 +26,7 @@ JsonObject ControllerState::to_json() const{
     );
 }
 void ControllerState::execute(
-    CancellableScope& scope,
+    Cancellable* scope,
     AbstractController& controller,
     Milliseconds duration
 ) const{

SerialPrograms/Source/Controllers/ControllerState.h

@@ -12,7 +12,7 @@
 namespace PokemonAutomation{
 
 class JsonObject;
-class CancellableScope;
+class Cancellable;
 class AbstractController;
 
 
@@ -39,7 +39,7 @@ class ControllerState{
 public:
     //  Execution
     virtual void execute(
-        CancellableScope& scope,
+        Cancellable* scope,
         AbstractController& controller,
         Milliseconds duration
     ) const;

SerialPrograms/Source/Controllers/ControllerStateTable.h

@@ -7,6 +7,7 @@
 #ifndef PokemonAutomation_Controllers_ControllerStateTable_H
 #define PokemonAutomation_Controllers_ControllerStateTable_H
 
+#include "Common/Cpp/CancellableScope.h"
 #include "Common/Cpp/Options/GroupOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "Common/Cpp/Options/EditableTableOption.h"
@@ -64,7 +65,7 @@ class ControllerCommandTable : public EditableTableOption{
         for (std::unique_ptr<ControllerStateRow>& command : table){
             Milliseconds duration;
             std::unique_ptr<ControllerState> state = command->get_state(duration);
-            state->execute(scope, controller, duration);
+            state->execute(&scope, controller, duration);
         }
     }
 

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

@@ -81,18 +81,11 @@ void JoyconController::run_controller_input(const ControllerInputState& state){
 
     replace_on_next_command();
 
-    WallClock timestamp = current_time();
-
     JoyconState controller_state;
     deltas.to_state(controller_state);
-    issue_full_controller_state(
-        nullptr,
-        false,
-        2000ms,
-        controller_state.buttons,
-        controller_state.joystick_x,
-        controller_state.joystick_y
-    );
+
+    WallClock timestamp = current_time();
+    controller_state.execute(nullptr, *this, 2000ms);
 
     on_command_input(timestamp, controller_state);
 }

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

@@ -77,12 +77,12 @@ JsonObject JoyconState::to_json() const{
     return obj;
 }
 void JoyconState::execute(
-    CancellableScope& scope,
+    Cancellable* scope,
     AbstractController& controller,
     Milliseconds duration
 ) const{
     controller.cast_with_exception<JoyconController>().issue_full_controller_state(
-        &scope,
+        scope,
         true,
         duration,
         buttons,

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

@@ -31,7 +31,7 @@ class JoyconState : public ControllerState{
     virtual JsonObject to_json() const override;
 
     virtual void execute(
-        CancellableScope& scope,
+        Cancellable* scope,
         AbstractController& controller,
         Milliseconds duration
     ) const override;

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

@@ -83,21 +83,11 @@ void ProController::run_controller_input(const ControllerInputState& state){
 
     replace_on_next_command();
 
-    WallClock timestamp = current_time();
-
     ProControllerState controller_state;
     deltas.to_state(controller_state);
-    issue_full_controller_state(
-        nullptr,
-        false,
-        2000ms,
-        controller_state.buttons,
-        controller_state.dpad,
-        controller_state.left_x,
-        controller_state.left_y,
-        controller_state.right_x,
-        controller_state.right_y
-    );
+
+    WallClock timestamp = current_time();
+    controller_state.execute(nullptr, *this, 2000ms);
 
     on_command_input(timestamp, controller_state);
 }

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

@@ -110,12 +110,12 @@ JsonObject ProControllerState::to_json() const{
     return obj;
 }
 void ProControllerState::execute(
-    CancellableScope& scope,
+    Cancellable* scope,
     AbstractController& controller,
     Milliseconds duration
 ) const{
     controller.cast_with_exception<ProController>().issue_full_controller_state(
-        &scope,
+        scope,
         true,
         duration,
         buttons,

SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.h

@@ -32,7 +32,7 @@ class ProControllerState : public ControllerState{
     virtual JsonObject to_json() const override;
 
     virtual void execute(
-        CancellableScope& scope,
+        Cancellable* scope,
         AbstractController& controller,
         Milliseconds duration
     ) const override;

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.cpp

@@ -174,10 +174,10 @@ void execute_json_schedule(
             }
 
             state.load_json(snapshot);
-            state.execute(context, context.controller(), Milliseconds(duration));
+            state.execute(&context, context.controller(), Milliseconds(duration));
         }
         state.clear();
-        state.execute(context, context.controller(), Seconds(seconds_wait_between_loops));
+        state.execute(&context, context.controller(), Seconds(seconds_wait_between_loops));
     }
 }