Finish the ConsoleHandle -> VideoStream reduction where appliable.

Author: Mysticial

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp

@@ -12,8 +12,10 @@
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
-#include "PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
 #include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "PokemonSV/Programs/PokemonSV_Navigation.h"
 #include "PokemonSV_AutoStory_Segment_00.h"
 #include "PokemonSV_AutoStory_Segment_01.h"
 #include "PokemonSV_AutoStory_Segment_02.h"
@@ -549,7 +551,7 @@ void AutoStory::value_changed(void* object){
 
 void AutoStory::test_checkpoints(
     SingleSwitchProgramEnvironment& env,
-    ConsoleHandle& console, 
+    VideoStream& stream,
     SwitchControllerContext& context,
     int start, int end, 
     int loop, int start_loop, int end_loop
@@ -611,7 +613,7 @@ void AutoStory::test_checkpoints(
 
     for (int checkpoint = start; checkpoint <= end; checkpoint++){
         if (checkpoint == 0){
-            console.log("checkpoint_0");
+            stream.log("checkpoint_0");
             checkpoint_list[checkpoint]();
             continue;
         }
@@ -629,26 +631,26 @@ void AutoStory::test_checkpoints(
             for (int i = 0; i < loop; i++){
                 if (i > 0){
                     try {
-                        reset_game(env.program_info(), console, context);
+                        reset_game(env.program_info(), stream, context);
                         enter_menu_from_overworld(env.program_info(), env.console, context, -1, MenuSide::NONE, has_minimap);
                         // we wait 5 seconds then save, so that the initial conditions are slightly different on each reset.
                         env.log("Wait 5 seconds.");
                         context.wait_for(Milliseconds(5 * 1000));
                     }catch(...){
                         // try one more time
-                        reset_game(env.program_info(), console, context);
+                        reset_game(env.program_info(), stream, context);
                         enter_menu_from_overworld(env.program_info(), env.console, context, -1, MenuSide::NONE, has_minimap);
                         // we wait 5 seconds then save, so that the initial conditions are slightly different on each reset.
                         env.log("Wait 5 seconds.");
                         context.wait_for(Milliseconds(5 * 1000));                        
 
                     }
                 }
-                console.log("checkpoint_" + number + ": loop " + std::to_string(i));
+                stream.log("checkpoint_" + number + ": loop " + std::to_string(i));
                 checkpoint_list[checkpoint]();
             } 
         }else{
-            console.log("checkpoint_" + number + ".");
+            stream.log("checkpoint_" + number + ".");
             checkpoint_list[checkpoint]();            
         }
 

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h

@@ -7,7 +7,6 @@
 #ifndef PokemonAutomation_PokemonSV_AutoStory_H
 #define PokemonAutomation_PokemonSV_AutoStory_H
 
-#include <functional>
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "Common/Cpp/Options/FloatingPointOption.h"
@@ -16,7 +15,6 @@
 #include "CommonTools/Options/StringSelectOption.h"
 #include "CommonTools/Options/LanguageOCROption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
 #include "PokemonSV_AutoStoryTools.h"
 
 namespace PokemonAutomation{
@@ -46,7 +44,7 @@ class AutoStory : public SingleSwitchProgramInstance, public ConfigOption::Liste
     // test each checkpoints "loop" number of times
     void test_checkpoints(
         SingleSwitchProgramEnvironment& env,
-        ConsoleHandle& console, 
+        VideoStream& stream,
         SwitchControllerContext& context,
         int start, int end, 
         int loop, int start_loop, int end_loop

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.cpp

@@ -9,7 +9,6 @@
 #include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonTools/OCR/OCR_NumberReader.h"
-#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 #include "PokemonSV_MenuOption.h"
 #include "PokemonSV/Inference/PokemonSV_MenuOptionReader.h"
 
@@ -24,14 +23,14 @@ namespace PokemonSV{
 MenuOption::~MenuOption() = default;
 
 MenuOption::MenuOption(
-    ConsoleHandle& console, 
+    VideoStream& stream,
     SwitchControllerContext& context,
     Language language
 )
-    : m_console(console)
+    : m_stream(stream)
     , m_context(context)
     , m_language(language)
-    , m_overlays(console.overlay())
+    , m_overlays(stream.overlay())
     , m_arrow(COLOR_CYAN, GradientArrowType::RIGHT, {0.02, 0.10, 0.05, 0.80})
 {
     // reader.make_overlays(m_overlays);
@@ -68,7 +67,7 @@ void MenuOption::set_target_option(const std::vector<MenuOptionToggleEnum>& targ
     OperationFailedException::fire(
         ErrorReport::SEND_ERROR_REPORT,
         "MenuOption::set_target_option(): Unable to set option to the correct toggle.",
-        m_console
+        m_stream
     );
 
 }
@@ -80,7 +79,7 @@ int8_t MenuOption::get_selected_index(const ImageViewRGB32& screen) const {
         OperationFailedException::fire(
             ErrorReport::SEND_ERROR_REPORT,
             "MenuOption::get_selected_index(): Unable to find cursor.",
-            m_console
+            m_stream
         );
     }
 
@@ -92,7 +91,7 @@ int8_t MenuOption::get_selected_index(const ImageViewRGB32& screen) const {
         OperationFailedException::fire(
             ErrorReport::SEND_ERROR_REPORT,
             "MenuOption::get_selected_index(): Invalid cursor slot.",
-            m_console
+            m_stream
         );
     }
     // cout << "selected index:" + std::to_string(selected_index) << endl;
@@ -103,7 +102,7 @@ int8_t MenuOption::get_selected_index(const ImageViewRGB32& screen) const {
 std::string MenuOption::read_option(const ImageViewRGB32& cropped) const{
     // cropped.save("test.png");
     const auto ocr_result = MenuOptionReader::instance().read_substring(
-        m_console,
+        m_stream.logger(),
         m_language,
         cropped, OCR::BLACK_TEXT_FILTERS()
     );
@@ -118,7 +117,7 @@ std::string MenuOption::read_option(const ImageViewRGB32& cropped) const{
     if (results.empty()){
         if (m_language == Language::German){
             // German Menu Option uses numbers for text speed settings, which string OCR has trouble with detecting.
-            int16_t number = read_number(m_console, cropped);
+            int16_t number = read_number(m_stream.logger(), cropped);
             switch (number){
                 case 1:
                     return "slow";
@@ -135,7 +134,7 @@ std::string MenuOption::read_option(const ImageViewRGB32& cropped) const{
         OperationFailedException::fire(
             ErrorReport::SEND_ERROR_REPORT,
             "MenuOption::read_option(): Unable to read item. Ambiguous or multiple results.",
-            m_console
+            m_stream
         );
     }
 
@@ -157,7 +156,7 @@ int16_t MenuOption::read_number(
 
 std::string MenuOption::read_option_item() const{
     m_context.wait_for_all_requests();
-    VideoSnapshot screen = m_console.video().snapshot();
+    VideoSnapshot screen = m_stream.video().snapshot();
 
     ImageFloatBox selected_box = m_boxes_item[get_selected_index(screen)];
     ImageViewRGB32 cropped = extract_box_reference(screen, selected_box);
@@ -167,7 +166,7 @@ std::string MenuOption::read_option_item() const{
 
 std::string MenuOption::read_option_toggle() const{
     m_context.wait_for_all_requests();
-    VideoSnapshot screen = m_console.video().snapshot();
+    VideoSnapshot screen = m_stream.video().snapshot();
 
     ImageFloatBox selected_box = m_boxes_toggle[get_selected_index(screen)];
     ImageViewRGB32 cropped = extract_box_reference(screen, selected_box);

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h

@@ -10,14 +10,14 @@
 #include <array>
 #include "CommonFramework/Language.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
 #include "NintendoSwitch/Controllers/NintendoSwitch_Controller.h"
 #include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
 #include "PokemonSV_MenuOptionDatabase.h"
 
 namespace PokemonAutomation{
     class AsyncDispatcher;
 namespace NintendoSwitch{
-    class ConsoleHandle;
 namespace PokemonSV{
 
 
@@ -26,7 +26,7 @@ class MenuOption{
 public:
     ~MenuOption();
     MenuOption(
-        ConsoleHandle& console, SwitchControllerContext& context,
+        VideoStream& stream, SwitchControllerContext& context,
         Language language
     );
 
@@ -64,7 +64,7 @@ class MenuOption{
 
 
 private:
-    ConsoleHandle& m_console;
+    VideoStream& m_stream;
     SwitchControllerContext& m_context;
     Language m_language;
     VideoOverlaySet m_overlays;

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOptionDatabase.h

@@ -12,7 +12,6 @@
 namespace PokemonAutomation{
     class AsyncDispatcher;
 namespace NintendoSwitch{
-    class ConsoleHandle;
 namespace PokemonSV{
 
 

SerialPrograms/Source/PokemonSV/Programs/Battles/PokemonSV_Battles.h

@@ -14,7 +14,6 @@
 namespace PokemonAutomation{
     struct ProgramInfo;
 namespace NintendoSwitch{
-    class ConsoleHandle;
 namespace PokemonSV{