From 9a1badbd6c97dbcb7d8a95c66ba571e0aea5b794 Mon Sep 17 00:00:00 2001 From: jw098 Date: Tue, 11 Aug 2026 23:41:46 -0700 Subject: [PATCH 01/11] create Core library. move nlohmann library. --- {3rdParty => 3rdParty-Core}/nlohmann/json.hpp | 0 .../nlohmann/json_fwd.hpp | 0 Common/Cpp/Json/JsonTools.h | 2 +- Common/Cpp/Json/JsonValue.cpp | 2 +- SerialPrograms/CMakeLists.txt | 27 +- .../DevPrograms/TestProgramComputer.cpp | 2 +- SerialPrograms/cmake/SourceFiles.cmake | 474 ++++++++++-------- 7 files changed, 280 insertions(+), 227 deletions(-) rename {3rdParty => 3rdParty-Core}/nlohmann/json.hpp (100%) rename {3rdParty => 3rdParty-Core}/nlohmann/json_fwd.hpp (100%) diff --git a/3rdParty/nlohmann/json.hpp b/3rdParty-Core/nlohmann/json.hpp similarity index 100% rename from 3rdParty/nlohmann/json.hpp rename to 3rdParty-Core/nlohmann/json.hpp diff --git a/3rdParty/nlohmann/json_fwd.hpp b/3rdParty-Core/nlohmann/json_fwd.hpp similarity index 100% rename from 3rdParty/nlohmann/json_fwd.hpp rename to 3rdParty-Core/nlohmann/json_fwd.hpp diff --git a/Common/Cpp/Json/JsonTools.h b/Common/Cpp/Json/JsonTools.h index eaeea6a7a8..93b77b526c 100644 --- a/Common/Cpp/Json/JsonTools.h +++ b/Common/Cpp/Json/JsonTools.h @@ -7,7 +7,7 @@ #ifndef PokemonAutomation_Common_Json_JsonTools_H #define PokemonAutomation_Common_Json_JsonTools_H -#include "3rdParty/nlohmann/json.hpp" +#include "3rdParty-Core/nlohmann/json.hpp" #include "JsonValue.h" namespace PokemonAutomation{ diff --git a/Common/Cpp/Json/JsonValue.cpp b/Common/Cpp/Json/JsonValue.cpp index 802d8c91ac..bf244f4894 100644 --- a/Common/Cpp/Json/JsonValue.cpp +++ b/Common/Cpp/Json/JsonValue.cpp @@ -4,7 +4,7 @@ * */ -#include "3rdParty/nlohmann/json.hpp" +#include "3rdParty-Core/nlohmann/json.hpp" #include "Common/Cpp/Filesystem/FileIO.h" #include "JsonValue.h" #include "JsonArray.h" diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt index 46fd3e6685..7fa0091169 100644 --- a/SerialPrograms/CMakeLists.txt +++ b/SerialPrograms/CMakeLists.txt @@ -145,15 +145,24 @@ add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00) # add current directory to find tesseractPA.lib link_directories(${CMAKE_CURRENT_LIST_DIR}) -# add the list of all code file paths as ${LIBRARY_SOURCES} and ${EXECUTABLE_SOURCES} +# add the list of all code file paths as ${CORE_LIBRARY_SOURCES}, ${LIBRARY_SOURCES} and ${EXECUTABLE_SOURCES} include(cmake/SourceFiles.cmake) # Organize source files in IDE project view +source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../../ FILES ${CORE_LIBRARY_SOURCES}) source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../../ FILES ${LIBRARY_SOURCES}) source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../../ FILES ${EXECUTABLE_SOURCES}) -# Create library target first -add_library(SerialProgramsLib STATIC ${LIBRARY_SOURCES}) +# Create GUI-free Controller library +add_library(CoreLib STATIC ${CORE_LIBRARY_SOURCES}) + +# see apply_common_target_properties() for target_include_directories, set_target_properties, target_compile_definitions + + + +# Create the GUI library +add_library(SerialProgramsLib STATIC ${CORE_LIBRARY_SOURCES} ${LIBRARY_SOURCES}) + # Create binary target if (APPLE) @@ -231,12 +240,22 @@ function(apply_common_target_properties target_name) target_compile_definitions(${target_name} PRIVATE NOMINMAX DPP_NO_DEPRECATED) #add include directory - target_include_directories(${target_name} SYSTEM PRIVATE ../3rdParty/) + target_include_directories(${target_name} SYSTEM PRIVATE ../3rdParty-Core) target_include_directories(${target_name} PRIVATE ../ ../../Internal/ Source/) + + if("NO_GUI" IN_LIST ARGN) + target_compile_definitions(${target_name} PRIVATE PA_IMAGE_BACKEND_None) + return() + endif() + + # more include directories + target_include_directories(${target_name} SYSTEM PRIVATE ../3rdParty/) target_link_directories(${target_name} PRIVATE ../3rdPartyBinaries/) + endfunction() # Apply common properties to both targets +apply_common_target_properties(CoreLib NO_GUI) apply_common_target_properties(SerialProgramsLib) apply_common_target_properties(SerialPrograms) diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp index 90c2d23761..8278c06f82 100644 --- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp +++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp @@ -61,7 +61,7 @@ #include "Common/Cpp/StreamConverters.h" #include "CommonFramework/AudioPipeline/AudioConstants.h" #include "CommonFramework/AudioPipeline/AudioStream.h" -#include "3rdParty/nlohmann/json.hpp" +#include "3rdParty-Core/nlohmann/json.hpp" #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" #include "Common/Cpp/Json/JsonObject.h" diff --git a/SerialPrograms/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake index c28c50f20f..c76d4671b9 100644 --- a/SerialPrograms/cmake/SourceFiles.cmake +++ b/SerialPrograms/cmake/SourceFiles.cmake @@ -7,21 +7,13 @@ set(EXECUTABLE_SOURCES "Source/CommonFramework/Main.cpp" ${DARK_STYLE_RES}) # Note: Command-line executable sources are defined in Source/CommandLine/CommandLineExecutable.cmake -file(GLOB LIBRARY_SOURCES - ../3rdParty/miniz-3.1.1/miniz.h - ../3rdParty/miniz-3.1.1/miniz.c - ../3rdParty/ONNX/OnnxToolsPA.h - ../3rdParty/QtWavFile/WavFile.cpp - ../3rdParty/QtWavFile/WavFile.h - ../3rdParty/TesseractPA/TesseractPA.cpp - ../3rdParty/TesseractPA/TesseractPA.h +file(GLOB CORE_LIBRARY_SOURCES + ../Common/ControllerStates/StandardHid_Keyboard_State.c ../Common/Compiler.h - ../Common/ControllerStates/HID_Keyboard_State.h ../Common/ControllerStates/NintendoSwitch_OemController_State.cpp ../Common/ControllerStates/NintendoSwitch_OemController_State.h ../Common/ControllerStates/NintendoSwitch_WiredController_State.h - ../Common/Cpp/BitmapConversion.cpp - ../Common/Cpp/BitmapConversion.h + ../Common/ControllerStates/StandardHid_Keyboard_State.h ../Common/Cpp/CancellableScope.cpp ../Common/Cpp/CancellableScope.h ../Common/Cpp/Color.cpp @@ -30,44 +22,26 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/ColoredText.h ../Common/Cpp/Concurrency/AsyncTask.h ../Common/Cpp/Concurrency/Backends/AsyncTask_Default.h - ../Common/Cpp/Concurrency/Backends/Thread_Qt.tpp ../Common/Cpp/Concurrency/Backends/Thread_StdThread.tpp - ../Common/Cpp/Concurrency/Backends/Thread_StdThreadDetach.tpp ../Common/Cpp/Concurrency/Backends/ThreadPool_Default.cpp ../Common/Cpp/Concurrency/Backends/ThreadPool_Default.h - ../Common/Cpp/Concurrency/BusyPeriodicRunner.cpp - ../Common/Cpp/Concurrency/BusyPeriodicRunner.h ../Common/Cpp/Concurrency/ConditionVariable.h - ../Common/Cpp/Concurrency/FireForgetDispatcher.cpp - ../Common/Cpp/Concurrency/FireForgetDispatcher.h ../Common/Cpp/Concurrency/Mutex.h - ../Common/Cpp/Concurrency/PeriodicRunner.cpp - ../Common/Cpp/Concurrency/PeriodicRunner.h ../Common/Cpp/Concurrency/Qt6.9ThreadBugWorkaround.h ../Common/Cpp/Concurrency/ReverseLockGuard.h - ../Common/Cpp/Concurrency/ScheduledTaskRunner.cpp - ../Common/Cpp/Concurrency/ScheduledTaskRunner.h ../Common/Cpp/Concurrency/SpinLock.cpp ../Common/Cpp/Concurrency/SpinLock.h ../Common/Cpp/Concurrency/SpinPause.h ../Common/Cpp/Concurrency/Thread.cpp ../Common/Cpp/Concurrency/Thread.h ../Common/Cpp/Concurrency/ThreadPool.h - ../Common/Cpp/Concurrency/Watchdog.cpp - ../Common/Cpp/Concurrency/Watchdog.h ../Common/Cpp/Containers/AlignedMalloc.cpp ../Common/Cpp/Containers/AlignedMalloc.h - ../Common/Cpp/Containers/AlignedVector.h - ../Common/Cpp/Containers/AlignedVector.tpp - ../Common/Cpp/Containers/BoxSet.h ../Common/Cpp/Containers/CircularBuffer.h - ../Common/Cpp/Containers/DllSafeString.h ../Common/Cpp/Containers/FixedLimitVector.h ../Common/Cpp/Containers/FixedLimitVector.tpp ../Common/Cpp/Containers/Pimpl.h ../Common/Cpp/Containers/Pimpl.tpp - ../Common/Cpp/Containers/SparseArray.cpp - ../Common/Cpp/Containers/SparseArray.h ../Common/Cpp/CpuId/CpuId.cpp ../Common/Cpp/CpuId/CpuId.h ../Common/Cpp/CpuId/CpuId_arm64.h @@ -82,10 +56,7 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/CpuUtilization/CpuUtilization_Windows.tpp ../Common/Cpp/Cryptography/SHA256.cpp ../Common/Cpp/Cryptography/SHA256.h - ../Common/Cpp/DateTime.h - ../Common/Cpp/EarlyShutdown.h ../Common/Cpp/EnumStringMap.h - ../Common/Cpp/EventRateTracker.h ../Common/Cpp/Exceptions.cpp ../Common/Cpp/Exceptions.h ../Common/Cpp/ExpressionEvaluator.cpp @@ -106,8 +77,6 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/Hardware/Hardware_x86.tpp ../Common/Cpp/Hardware/Hardware_x86_Linux.tpp ../Common/Cpp/Hardware/Hardware_x86_Windows.tpp - ../Common/Cpp/ImageResolution.cpp - ../Common/Cpp/ImageResolution.h ../Common/Cpp/Json/JsonArray.cpp ../Common/Cpp/Json/JsonArray.h ../Common/Cpp/Json/JsonObject.cpp @@ -127,115 +96,314 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/Logging/LastLogTracker.cpp ../Common/Cpp/Logging/LastLogTracker.h ../Common/Cpp/Logging/MultiOutputLogger.h - ../Common/Cpp/Logging/OutputRedirector.cpp - ../Common/Cpp/Logging/OutputRedirector.h ../Common/Cpp/Logging/TaggedLogger.cpp ../Common/Cpp/Logging/TaggedLogger.h - ../Common/Cpp/MemoryUtilization/MemoryUtilization.cpp - ../Common/Cpp/MemoryUtilization/MemoryUtilization.h - ../Common/Cpp/MemoryUtilization/MemoryUtilization_Linux.tpp - ../Common/Cpp/MemoryUtilization/MemoryUtilization_Mac.tpp - ../Common/Cpp/MemoryUtilization/MemoryUtilization_Windows.tpp ../Common/Cpp/Options/BatchOption.cpp ../Common/Cpp/Options/BatchOption.h ../Common/Cpp/Options/BooleanCheckBoxOption.cpp ../Common/Cpp/Options/BooleanCheckBoxOption.h - ../Common/Cpp/Options/BoxFloatOption.cpp - ../Common/Cpp/Options/BoxFloatOption.h ../Common/Cpp/Options/ButtonOption.cpp ../Common/Cpp/Options/ButtonOption.h - ../Common/Cpp/Options/CheckboxDropdownDatabase.h - ../Common/Cpp/Options/CheckboxDropdownOption.cpp - ../Common/Cpp/Options/CheckboxDropdownOption.h - ../Common/Cpp/Options/CheckboxDropdownOption.tpp ../Common/Cpp/Options/ColorOption.cpp ../Common/Cpp/Options/ColorOption.h ../Common/Cpp/Options/ConfigOption.cpp ../Common/Cpp/Options/ConfigOption.h - ../Common/Cpp/Options/DateOption.cpp - ../Common/Cpp/Options/DateOption.h ../Common/Cpp/Options/EditableTableOption.cpp ../Common/Cpp/Options/EditableTableOption.h ../Common/Cpp/Options/EnumDropdownDatabase.cpp ../Common/Cpp/Options/EnumDropdownDatabase.h ../Common/Cpp/Options/EnumDropdownOption.cpp ../Common/Cpp/Options/EnumDropdownOption.h + ../Common/Cpp/Options/GroupOption.cpp + ../Common/Cpp/Options/GroupOption.h + ../Common/Cpp/Options/MacAddressOption.cpp + ../Common/Cpp/Options/MacAddressOption.h + ../Common/Cpp/Options/SimpleIntegerOption.cpp + ../Common/Cpp/Options/SimpleIntegerOption.h + ../Common/Cpp/Options/SimpleIntegerOptionBase.h + ../Common/Cpp/Options/StaticTextOption.cpp + ../Common/Cpp/Options/StaticTextOption.h + ../Common/Cpp/Options/StringOption.cpp + ../Common/Cpp/Options/StringOption.h + ../Common/Cpp/Options/TimeDurationOption.cpp + ../Common/Cpp/Options/TimeDurationOption.h + ../Common/Cpp/PanicDump.cpp + ../Common/Cpp/PanicDump.h + ../Common/Cpp/PrettyPrint.cpp + ../Common/Cpp/PrettyPrint.h + ../Common/Cpp/RecursiveThrottler.h + ../Common/Cpp/SerialConnection/SerialConnection.cpp + ../Common/Cpp/SerialConnection/SerialConnection.h + ../Common/Cpp/SerialConnection/SerialConnectionPOSIX.h + ../Common/Cpp/SerialConnection/SerialConnectionWinAPI.h + ../Common/Cpp/SparseRegion.cpp + ../Common/Cpp/SparseRegion.h + ../Common/Cpp/Stopwatch.h + ../Common/Cpp/StreamConnections/PollingStreamConnections.h + ../Common/Cpp/StreamConnections/PushingStreamConnections.h + ../Common/Cpp/StreamConnections/StreamInterface.h + ../Common/Cpp/Strings/StringTools.cpp + ../Common/Cpp/Strings/StringTools.h + ../Common/Cpp/Strings/Unicode.cpp + ../Common/Cpp/Strings/Unicode.h + ../Common/Cpp/Time.cpp + ../Common/Cpp/Time.h + ../Common/Cpp/UiWrapper.h + ../Common/CRC32/pabb_CRC32.c + ../Common/CRC32/pabb_CRC32.h + ../Common/PABotBase2/Controllers/PABotBase2_Controller_HID_Keyboard.h + ../Common/PABotBase2/Controllers/PABotBase2_Controller_NS1_OemController.h + ../Common/PABotBase2/Controllers/PABotBase2_Controller_NS_WiredController.h + ../Common/PABotBase2/PABotBase2_MessageProtocol.h + ../Common/PABotBase2/PABotBase2CC_MessageDumper.cpp + ../Common/PABotBase2/PABotBase2CC_MessageDumper.h + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.cpp + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.h + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketProtocol.h + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.cpp + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.h + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_StreamCoalescer.cpp + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_StreamCoalescer.h + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.cpp + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h + ../Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h + Source/CommonFramework/Environment/Environment.cpp + Source/CommonFramework/Environment/Environment.h + Source/CommonFramework/Environment/Environment_Linux.h + Source/CommonFramework/Environment/Environment_Linux.tpp + Source/CommonFramework/Environment/Environment_Windows.h + Source/CommonFramework/Environment/Environment_Windows.tpp + Source/CommonFramework/Logging/Logger.cpp + Source/CommonFramework/Logging/Logger.h + Source/CommonFramework/Options/Environment/CoreAffinityOption.cpp + Source/CommonFramework/Options/Environment/CoreAffinityOption.h + Source/CommonFramework/Options/Environment/PerformanceOptions.cpp + Source/CommonFramework/Options/Environment/PerformanceOptions.h + Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp + Source/CommonFramework/Options/Environment/ProcessorLevelOption.h + Source/CommonFramework/Options/Environment/ProcessPriorityOption.h + Source/CommonFramework/Options/ThreadPoolOption.cpp + Source/CommonFramework/Options/ThreadPoolOption.h + Source/CommonFramework/StaticGlobals.cpp + Source/CommonFramework/StaticGlobals.h + Source/CommonFramework/Tools/GlobalThreadPools.cpp + Source/CommonFramework/Tools/GlobalThreadPools.h + Source/CommonTools/Async/InterruptableCommands.cpp + Source/CommonTools/Async/InterruptableCommands.h + Source/CommonTools/Async/InterruptableCommands.tpp + Source/CommonTools/InferenceCallbacks/InferenceCallback.h + Source/CommonTools/Random.cpp + Source/CommonTools/Random.h + Source/ControllerInput/ControllerInput.cpp + Source/ControllerInput/ControllerInput.h + Source/ControllerInput/Keyboard/KeyBindingOption.cpp + Source/ControllerInput/Keyboard/KeyBindingOption.h + Source/ControllerInput/Keyboard/KeyboardHidButtons.h + Source/ControllerInput/Keyboard/KeyboardInput_State.cpp + Source/ControllerInput/Keyboard/KeyboardInput_State.h + Source/Controllers/Controller.cpp + Source/Controllers/Controller.h + Source/Controllers/ControllerConnection.cpp + Source/Controllers/ControllerConnection.h + Source/Controllers/ControllerDescriptor.cpp + Source/Controllers/ControllerDescriptor.h + Source/Controllers/ControllerOption.cpp + Source/Controllers/ControllerOption.h + Source/Controllers/ControllerSettings.h + Source/Controllers/ControllerStatusThread.h + Source/Controllers/ControllerTypes.h + Source/Controllers/ControllerTypeStrings.cpp + Source/Controllers/ControllerTypeStrings.h + Source/Controllers/Joystick.cpp + Source/Controllers/Joystick.h + Source/Controllers/JoystickTools.h + Source/Controllers/NullController.cpp + Source/Controllers/NullController.h + Source/Controllers/PABotBase2/PABotBase2_CommandQueueManager.cpp + Source/Controllers/PABotBase2/PABotBase2_CommandQueueManager.h + Source/Controllers/PABotBase2/PABotBase2_Connection.cpp + Source/Controllers/PABotBase2/PABotBase2_Connection.h + Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.cpp + Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.h + Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp + Source/Controllers/PABotBase2/PABotBase2_MessageHandler.h + Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.cpp + Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.h + Source/Controllers/RumbleListener.h + Source/Controllers/Schedulers/ControllerWithScheduler.h + Source/Controllers/Schedulers/SuperscalarScheduler.cpp + Source/Controllers/Schedulers/SuperscalarScheduler.h + Source/Controllers/SerialPABotBase/Connection/MessageLogger.cpp + Source/Controllers/SerialPABotBase/Connection/MessageLogger.h + Source/Controllers/SerialPABotBase/SerialPABotBase.cpp + Source/Controllers/SerialPABotBase/SerialPABotBase.h + Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.cpp + Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.h + Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp + Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.h + Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp + Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h + Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.cpp + Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.h + Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.cpp + Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h + Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.cpp + Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h + Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.cpp + Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h + Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.cpp + Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.h + Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Joycon.h + Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp + Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.h + Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_ProController.h + Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.cpp + Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.h + Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp + Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h + Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp + Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.h + Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.cpp + Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.h + + + ../Common/Cpp/ImageResolution.cpp + ../Common/Cpp/ImageResolution.h + + Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.cpp + Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.h + + Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.cpp + Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h + + Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp + Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.h + + Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp + Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h + + Source/CommonFramework/Globals.cpp + Source/CommonFramework/Globals.h + + Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp + Source/CommonFramework/ImageTypes/ImageViewPlanar32.h + Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp + Source/CommonFramework/ImageTypes/ImageViewRGB32.h + + ../Common/Cpp/Containers/AlignedVector.h + ../Common/Cpp/Containers/AlignedVector.tpp + + Source/CommonFramework/ImageTypes/ImageRGB32.cpp + Source/CommonFramework/ImageTypes/ImageRGB32.h + + Source/CommonTools/Options/StringSelectOption.cpp + Source/CommonTools/Options/StringSelectOption.h + + Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp + Source/Controllers/PABotBase2/SerialPABotBase2_Connection.h + + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.h + + Source/Controllers/StandardHid/StandardHid_Keyboard.cpp + Source/Controllers/StandardHid/StandardHid_Keyboard.h + + Source/Controllers/ControllerState.cpp + Source/Controllers/ControllerState.h + + + Source/Integrations/PybindSwitchController.cpp + Source/Integrations/PybindSwitchController.h +) + +file(GLOB LIBRARY_SOURCES + + + + + + ../3rdParty/miniz-3.1.1/miniz.h + ../3rdParty/miniz-3.1.1/miniz.c + ../3rdParty/ONNX/OnnxToolsPA.h + ../3rdParty/QtWavFile/WavFile.cpp + ../3rdParty/QtWavFile/WavFile.h + ../3rdParty/TesseractPA/TesseractPA.cpp + ../3rdParty/TesseractPA/TesseractPA.h + ../Common/Cpp/BitmapConversion.cpp + ../Common/Cpp/BitmapConversion.h + ../Common/Cpp/Concurrency/Backends/Thread_Qt.tpp + ../Common/Cpp/Concurrency/Backends/Thread_StdThreadDetach.tpp + ../Common/Cpp/Concurrency/BusyPeriodicRunner.cpp + ../Common/Cpp/Concurrency/BusyPeriodicRunner.h + ../Common/Cpp/Concurrency/FireForgetDispatcher.cpp + ../Common/Cpp/Concurrency/FireForgetDispatcher.h + ../Common/Cpp/Concurrency/PeriodicRunner.cpp + ../Common/Cpp/Concurrency/PeriodicRunner.h + ../Common/Cpp/Concurrency/ScheduledTaskRunner.cpp + ../Common/Cpp/Concurrency/ScheduledTaskRunner.h + ../Common/Cpp/Concurrency/Watchdog.cpp + ../Common/Cpp/Concurrency/Watchdog.h + ../Common/Cpp/Containers/BoxSet.h + ../Common/Cpp/Containers/DllSafeString.h + ../Common/Cpp/Containers/SparseArray.cpp + ../Common/Cpp/Containers/SparseArray.h + ../Common/Cpp/DateTime.h + ../Common/Cpp/EarlyShutdown.h + ../Common/Cpp/EventRateTracker.h + ../Common/Cpp/Logging/OutputRedirector.cpp + ../Common/Cpp/Logging/OutputRedirector.h + ../Common/Cpp/MemoryUtilization/MemoryUtilization.cpp + ../Common/Cpp/MemoryUtilization/MemoryUtilization.h + ../Common/Cpp/MemoryUtilization/MemoryUtilization_Linux.tpp + ../Common/Cpp/MemoryUtilization/MemoryUtilization_Mac.tpp + ../Common/Cpp/MemoryUtilization/MemoryUtilization_Windows.tpp + ../Common/Cpp/Options/BoxFloatOption.cpp + ../Common/Cpp/Options/BoxFloatOption.h + ../Common/Cpp/Options/CheckboxDropdownDatabase.h + ../Common/Cpp/Options/CheckboxDropdownOption.cpp + ../Common/Cpp/Options/CheckboxDropdownOption.h + ../Common/Cpp/Options/CheckboxDropdownOption.tpp + ../Common/Cpp/Options/DateOption.cpp + ../Common/Cpp/Options/DateOption.h ../Common/Cpp/Options/FixedCodeOption.cpp ../Common/Cpp/Options/FixedCodeOption.h ../Common/Cpp/Options/FloatingPointOption.cpp ../Common/Cpp/Options/FloatingPointOption.h - ../Common/Cpp/Options/GroupOption.cpp - ../Common/Cpp/Options/GroupOption.h ../Common/Cpp/Options/IntegerRangeOption.cpp ../Common/Cpp/Options/IntegerRangeOption.h ../Common/Cpp/Options/KeyboardLayoutOption.cpp ../Common/Cpp/Options/KeyboardLayoutOption.h - ../Common/Cpp/Options/MacAddressOption.cpp - ../Common/Cpp/Options/MacAddressOption.h ../Common/Cpp/Options/PathOption.cpp ../Common/Cpp/Options/PathOption.h ../Common/Cpp/Options/RandomCodeOption.cpp ../Common/Cpp/Options/RandomCodeOption.h - ../Common/Cpp/Options/SimpleIntegerOptionBase.h - ../Common/Cpp/Options/SimpleIntegerOption.cpp - ../Common/Cpp/Options/SimpleIntegerOption.h ../Common/Cpp/Options/StaticTableOption.cpp ../Common/Cpp/Options/StaticTableOption.h - ../Common/Cpp/Options/StaticTextOption.cpp - ../Common/Cpp/Options/StaticTextOption.h - ../Common/Cpp/Options/StringOption.cpp - ../Common/Cpp/Options/StringOption.h ../Common/Cpp/Options/TextEditOption.cpp ../Common/Cpp/Options/TextEditOption.h - ../Common/Cpp/Options/TimeDurationOption.cpp - ../Common/Cpp/Options/TimeDurationOption.h ../Common/Cpp/Options/TimeExpressionOption.cpp ../Common/Cpp/Options/TimeExpressionOption.h - ../Common/Cpp/PanicDump.cpp - ../Common/Cpp/PanicDump.h ../Common/Cpp/PixelRGB32.h - ../Common/Cpp/PrettyPrint.cpp - ../Common/Cpp/PrettyPrint.h ../Common/Cpp/PrintDebuggers.h ../Common/Cpp/Rectangle.h ../Common/Cpp/Rectangle.tpp - ../Common/Cpp/RecursiveThrottler.h ../Common/Cpp/ScopeExit.h ../Common/Cpp/SIMDDebuggers.h - ../Common/Cpp/SparseRegion.cpp - ../Common/Cpp/SparseRegion.h - ../Common/Cpp/SerialConnection/SerialConnection.cpp - ../Common/Cpp/SerialConnection/SerialConnection.h - ../Common/Cpp/SerialConnection/SerialConnectionPOSIX.h - ../Common/Cpp/SerialConnection/SerialConnectionWinAPI.h ../Common/Cpp/StreamConnections/MockDevice.cpp ../Common/Cpp/StreamConnections/MockDevice.h - ../Common/Cpp/StreamConnections/PollingStreamConnections.h - ../Common/Cpp/StreamConnections/PushingStreamConnections.h - ../Common/Cpp/StreamConnections/StreamInterface.h ../Common/Cpp/Sockets/AbstractClientSocket.h ../Common/Cpp/Sockets/ClientSocket.cpp ../Common/Cpp/Sockets/ClientSocket.h ../Common/Cpp/Sockets/ClientSocket_POSIX.h ../Common/Cpp/Sockets/ClientSocket_Qt.h ../Common/Cpp/Sockets/ClientSocket_WinSocket.h - ../Common/Cpp/Stopwatch.h ../Common/Cpp/StreamConverters.cpp ../Common/Cpp/StreamConverters.h - ../Common/Cpp/Strings/StringTools.cpp - ../Common/Cpp/Strings/StringTools.h - ../Common/Cpp/Strings/Unicode.cpp - ../Common/Cpp/Strings/Unicode.h ../Common/Cpp/TestRunners/UnitTest.h ../Common/Cpp/TestRunners/UnitTestDatabase.h ../Common/Cpp/TestRunners/ParallelUnitTestRunner.cpp ../Common/Cpp/TestRunners/ParallelUnitTestRunner.h - ../Common/Cpp/Time.cpp - ../Common/Cpp/Time.h - ../Common/Cpp/UiWrapper.h ../Common/Cpp/ValueDebouncer.h - ../Common/CRC32/pabb_CRC32.c - ../Common/CRC32/pabb_CRC32.h ../Common/Qt/AutoHeightTable.cpp ../Common/Qt/AutoHeightTable.h ../Common/Qt/AutoWidthLineEdit.cpp @@ -309,30 +477,12 @@ file(GLOB LIBRARY_SOURCES ../Common/Qt/UiStateQtWidget.h ../Common/Qt/WidgetStackFixedAspectRatio.cpp ../Common/Qt/WidgetStackFixedAspectRatio.h - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.h - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.cpp - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.h - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketProtocol.h - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.cpp - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.h - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_StreamCoalescer.cpp - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_StreamCoalescer.h - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.cpp - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.cpp ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.h - ../Common/PABotBase2/Controllers/PABotBase2_Controller_HID_Keyboard.h - ../Common/PABotBase2/Controllers/PABotBase2_Controller_NS_WiredController.h - ../Common/PABotBase2/Controllers/PABotBase2_Controller_NS1_OemController.h - ../Common/PABotBase2/PABotBase2CC_MessageDumper.cpp - ../Common/PABotBase2/PABotBase2CC_MessageDumper.h - ../Common/PABotBase2/PABotBase2_MessageProtocol.h ../Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h ../Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h ../Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h ../Common/SerialPABotBase/SerialPABotBase_Protocol.h - ../Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h Source/CommonFramework/AudioPipeline/AudioConstants.h Source/CommonFramework/AudioPipeline/AudioFeed.h Source/CommonFramework/AudioPipeline/AudioInfo.cpp @@ -376,12 +526,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.h Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.h - Source/CommonFramework/Environment/Environment.cpp - Source/CommonFramework/Environment/Environment.h - Source/CommonFramework/Environment/Environment_Linux.h - Source/CommonFramework/Environment/Environment_Linux.tpp - Source/CommonFramework/Environment/Environment_Windows.h - Source/CommonFramework/Environment/Environment_Windows.tpp Source/CommonFramework/Environment/HardwareValidation.cpp Source/CommonFramework/Environment/HardwareValidation.h Source/CommonFramework/Environment/HardwareValidation_arm64.tpp @@ -411,8 +555,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/GlobalServices.h Source/CommonFramework/GlobalSettingsPanel.cpp Source/CommonFramework/GlobalSettingsPanel.h - Source/CommonFramework/Globals.cpp - Source/CommonFramework/Globals.h Source/CommonFramework/ImageTools/FloatPixel.cpp Source/CommonFramework/ImageTools/FloatPixel.h Source/CommonFramework/ImageTools/ImageBoxes.cpp @@ -425,24 +567,16 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/ImageTypes/BinaryImage.h Source/CommonFramework/ImageTypes/ImageHSV32.cpp Source/CommonFramework/ImageTypes/ImageHSV32.h - Source/CommonFramework/ImageTypes/ImageRGB32.cpp - Source/CommonFramework/ImageTypes/ImageRGB32.h Source/CommonFramework/ImageTypes/ImageRGB32_OpenCV.cpp Source/CommonFramework/ImageTypes/ImageRGB32_OpenCV.h Source/CommonFramework/ImageTypes/ImageRGB32_Qt.cpp Source/CommonFramework/ImageTypes/ImageRGB32_Qt.h Source/CommonFramework/ImageTypes/ImageViewHSV32.cpp Source/CommonFramework/ImageTypes/ImageViewHSV32.h - Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp - Source/CommonFramework/ImageTypes/ImageViewPlanar32.h - Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp - Source/CommonFramework/ImageTypes/ImageViewRGB32.h Source/CommonFramework/Language.cpp Source/CommonFramework/Language.h Source/CommonFramework/Logging/LoggerWindow.cpp Source/CommonFramework/Logging/LoggerWindow.h - Source/CommonFramework/Logging/Logger.cpp - Source/CommonFramework/Logging/Logger.h Source/CommonFramework/Logging/OutputRedirector.h Source/CommonFramework/Logging/QueuedLogger.cpp Source/CommonFramework/Logging/QueuedLogger.h @@ -462,14 +596,7 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Options/BoxOption.cpp Source/CommonFramework/Options/BoxOption.h Source/CommonFramework/Options/CheckForUpdatesOption.h - Source/CommonFramework/Options/Environment/CoreAffinityOption.cpp - Source/CommonFramework/Options/Environment/CoreAffinityOption.h Source/CommonFramework/Options/Environment/OnnxOptions.h - Source/CommonFramework/Options/Environment/PerformanceOptions.cpp - Source/CommonFramework/Options/Environment/PerformanceOptions.h - Source/CommonFramework/Options/Environment/ProcessPriorityOption.h - Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp - Source/CommonFramework/Options/Environment/ProcessorLevelOption.h Source/CommonFramework/Options/Environment/SleepSuppressOption.cpp Source/CommonFramework/Options/Environment/SleepSuppressOption.h Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp @@ -483,8 +610,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Options/ResolutionOption.cpp Source/CommonFramework/Options/ResolutionOption.h Source/CommonFramework/Options/ScreenshotFormatOption.h - Source/CommonFramework/Options/ThreadPoolOption.cpp - Source/CommonFramework/Options/ThreadPoolOption.h Source/CommonFramework/Panels/ConsoleSettingsStretch.h Source/CommonFramework/Panels/PanelDescriptor.cpp Source/CommonFramework/Panels/PanelDescriptor.h @@ -509,8 +634,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/PersistentSettings.h Source/CommonFramework/ProgramSession.cpp Source/CommonFramework/ProgramSession.h - Source/CommonFramework/StaticGlobals.cpp - Source/CommonFramework/StaticGlobals.h Source/CommonFramework/ProgramStats/StatsDatabase.cpp Source/CommonFramework/ProgramStats/StatsDatabase.h Source/CommonFramework/ProgramStats/StatsTracking.cpp @@ -562,8 +685,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Tools/FileHash.h Source/CommonFramework/Tools/FileUnzip.cpp Source/CommonFramework/Tools/FileUnzip.h - Source/CommonFramework/Tools/GlobalThreadPools.cpp - Source/CommonFramework/Tools/GlobalThreadPools.h Source/CommonFramework/Tools/ProgramEnvironment.cpp Source/CommonFramework/Tools/ProgramEnvironment.h Source/CommonFramework/Tools/StatAccumulator.cpp @@ -642,9 +763,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonTools/Async/InferenceRoutines.h Source/CommonTools/Async/InferenceSession.cpp Source/CommonTools/Async/InferenceSession.h - Source/CommonTools/Async/InterruptableCommands.cpp - Source/CommonTools/Async/InterruptableCommands.h - Source/CommonTools/Async/InterruptableCommands.tpp Source/CommonTools/Async/SuperControlSession.cpp Source/CommonTools/Async/SuperControlSession.h Source/CommonTools/Async/SuperControlSession.tpp @@ -696,7 +814,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonTools/Images/WaterfillUtilities.cpp Source/CommonTools/Images/WaterfillUtilities.h Source/CommonTools/InferenceCallbacks/AudioInferenceCallback.h - Source/CommonTools/InferenceCallbacks/InferenceCallback.h Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.cpp Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.h Source/CommonTools/InferencePivots/AudioInferencePivot.cpp @@ -742,12 +859,8 @@ file(GLOB LIBRARY_SOURCES Source/CommonTools/Options/QtWidgets/StringSelectWidget.h Source/CommonTools/Options/ScreenWatchOption.cpp Source/CommonTools/Options/ScreenWatchOption.h - Source/CommonTools/Options/StringSelectOption.cpp - Source/CommonTools/Options/StringSelectOption.h Source/CommonTools/Options/StringSelectTableOption.h Source/CommonTools/Options/TrainOCRModeOption.h - Source/CommonTools/Random.cpp - Source/CommonTools/Random.h Source/CommonTools/Resources/SpriteDatabase.cpp Source/CommonTools/Resources/SpriteDatabase.h Source/CommonTools/StartupChecks/StartProgramChecks.cpp @@ -782,72 +895,29 @@ file(GLOB LIBRARY_SOURCES Source/ConsoleInfra/ConsoleSystemOption.h Source/ConsoleInfra/ConsoleSystemSession.cpp Source/ConsoleInfra/ConsoleSystemSession.h - Source/ControllerInput/ControllerInput.cpp - Source/ControllerInput/ControllerInput.h Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.h Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp Source/ControllerInput/Keyboard/GlobalQtKeyMap.h - Source/ControllerInput/Keyboard/KeyBindingOption.cpp - Source/ControllerInput/Keyboard/KeyBindingOption.h Source/ControllerInput/Keyboard/KeyBindingWidget.cpp Source/ControllerInput/Keyboard/KeyBindingWidget.h - Source/ControllerInput/Keyboard/KeyboardHidButtons.h Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.cpp Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.h Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_AZERTY.cpp Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_QWERTY.cpp - Source/ControllerInput/Keyboard/KeyboardInput_State.cpp - Source/ControllerInput/Keyboard/KeyboardInput_State.h Source/ControllerInput/Keyboard/KeyboardInput_StateTracker.cpp Source/ControllerInput/Keyboard/KeyboardInput_StateTracker.h - Source/Controllers/Controller.cpp - Source/Controllers/Controller.h - Source/Controllers/ControllerConnection.cpp - Source/Controllers/ControllerConnection.h - Source/Controllers/ControllerDescriptor.cpp - Source/Controllers/ControllerDescriptor.h - Source/Controllers/ControllerOption.cpp - Source/Controllers/ControllerOption.h Source/Controllers/ControllerSelectorWidget.cpp Source/Controllers/ControllerSelectorWidget.h Source/Controllers/ControllerSession.cpp Source/Controllers/ControllerSession.h - Source/Controllers/ControllerSettings.h - Source/Controllers/ControllerState.cpp - Source/Controllers/ControllerState.h Source/Controllers/ControllerStateTable.cpp Source/Controllers/ControllerStateTable.h - Source/Controllers/ControllerStatusThread.h - Source/Controllers/ControllerTypeStrings.cpp - Source/Controllers/ControllerTypeStrings.h - Source/Controllers/ControllerTypes.h - Source/Controllers/Joystick.cpp - Source/Controllers/Joystick.h - Source/Controllers/JoystickTools.h - Source/Controllers/NullController.cpp - Source/Controllers/NullController.h Source/Controllers/NullControllerWidget.cpp Source/Controllers/NullControllerWidget.h - Source/Controllers/RumbleListener.h - Source/Controllers/PABotBase2/PABotBase2_CommandQueueManager.cpp - Source/Controllers/PABotBase2/PABotBase2_CommandQueueManager.h - Source/Controllers/PABotBase2/PABotBase2_Connection.cpp - Source/Controllers/PABotBase2/PABotBase2_Connection.h - Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.cpp - Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.h - Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp - Source/Controllers/PABotBase2/PABotBase2_MessageHandler.h - Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp - Source/Controllers/PABotBase2/SerialPABotBase2_Connection.h - Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.cpp - Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.h Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.h Source/Controllers/PABotBase2/SerialPABotBase_StatusThread.h - Source/Controllers/Schedulers/ControllerWithScheduler.h - Source/Controllers/Schedulers/SuperscalarScheduler.cpp - Source/Controllers/Schedulers/SuperscalarScheduler.h Source/Controllers/SerialPort/SerialLogger.cpp Source/Controllers/SerialPort/SerialLogger.h Source/Controllers/SerialPort/SerialPABotBase.cpp @@ -856,10 +926,6 @@ file(GLOB LIBRARY_SOURCES Source/Controllers/SerialPort/SerialPortPollerQt.h Source/Controllers/StandardHid/StandardHid_Keyboard.cpp Source/Controllers/StandardHid/StandardHid_Keyboard.h - Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp - Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.h - Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.cpp - Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.h Source/Integrations/DiscordIntegrationSettings.cpp Source/Integrations/DiscordIntegrationSettings.h Source/Integrations/DiscordIntegrationTable.cpp @@ -1111,40 +1177,12 @@ file(GLOB LIBRARY_SOURCES Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h - Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp - Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h - Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.cpp - Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.h Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.cpp Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.h - Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp - Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.h - Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.cpp - Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.h - Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.cpp - Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h - Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp - Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h - Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.cpp - Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h - Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp - Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h - Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.cpp - Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.h Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.cpp Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.h - Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp - Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.h - Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.cpp - Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.h - Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Joycon.h - Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp - Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.h - Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_ProController.h - Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.cpp - Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.h Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ControllerState.h Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.cpp Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.h @@ -1226,8 +1264,6 @@ file(GLOB LIBRARY_SOURCES Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h - Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.cpp - Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.cpp Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.cpp @@ -1265,8 +1301,6 @@ file(GLOB LIBRARY_SOURCES Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_CodeEntryTools.h Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.h - Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.cpp - Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.h Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.cpp Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp From f78d703f707d397dfe18d7275aff2d592f121512 Mon Sep 17 00:00:00 2001 From: jw098 Date: Sat, 29 Aug 2026 19:01:12 -0700 Subject: [PATCH 02/11] update to core library --- SerialPrograms/CMakeLists.txt | 22 ++++++++-------- .../ErrorReports/ErrorReports.cpp | 10 ++++++++ .../Notifications/ProgramNotifications.cpp | 2 +- SerialPrograms/cmake/SourceFiles.cmake | 25 +++++++++---------- 4 files changed, 35 insertions(+), 24 deletions(-) diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt index 7fa0091169..cab1fa7ff4 100644 --- a/SerialPrograms/CMakeLists.txt +++ b/SerialPrograms/CMakeLists.txt @@ -224,16 +224,6 @@ endif() # Function to apply common properties to both library and executable targets function(apply_common_target_properties target_name) set_target_properties(${target_name} PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(${target_name} PRIVATE - Qt${QT_MAJOR}::Widgets - Qt${QT_MAJOR}::SerialPort - Qt${QT_MAJOR}::Multimedia - Qt${QT_MAJOR}::MultimediaWidgets - Qt${QT_MAJOR}::OpenGLWidgets - Qt${QT_MAJOR}::Qml - Qt${QT_MAJOR}::Quick - Qt${QT_MAJOR}::QuickWidgets - ) target_link_libraries(${target_name} PRIVATE Threads::Threads) #add defines @@ -248,6 +238,18 @@ function(apply_common_target_properties target_name) return() endif() + # include Qt headers + target_link_libraries(${target_name} PRIVATE + Qt${QT_MAJOR}::Widgets + Qt${QT_MAJOR}::SerialPort + Qt${QT_MAJOR}::Multimedia + Qt${QT_MAJOR}::MultimediaWidgets + Qt${QT_MAJOR}::OpenGLWidgets + Qt${QT_MAJOR}::Qml + Qt${QT_MAJOR}::Quick + Qt${QT_MAJOR}::QuickWidgets + ) + # more include directories target_include_directories(${target_name} SYSTEM PRIVATE ../3rdParty/) target_link_directories(${target_name} PRIVATE ../3rdPartyBinaries/) diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp index e988e39c86..f27bcf379c 100644 --- a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp +++ b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp @@ -5,8 +5,10 @@ */ #include +#ifdef QT_CORE_LIB #include #include +#endif #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Logging/GlobalLogger.h" #include "Common/Cpp/Logging/LastLogTracker.h" @@ -113,7 +115,9 @@ SendableErrorReport::SendableErrorReport() , m_program_runtime_millis(0) , m_dump_name(ERROR_DUMP_NAME) { +#ifdef QT_CORE_LIB QDir().mkpath(QString::fromStdString(m_directory)); +#endif } SendableErrorReport::SendableErrorReport( Logger* logger, @@ -143,6 +147,7 @@ SendableErrorReport::SendableErrorReport( log += line.text; log += "\r\n"; } + #ifdef QT_CORE_LIB QFile file(QString::fromStdString(m_directory + ERROR_LOGS_NAME)); bool exists = file.exists(); if (file.open(QIODevice::WriteOnly)){ @@ -153,6 +158,7 @@ SendableErrorReport::SendableErrorReport( file.write(log.c_str()); file.flush(); } + #endif m_logs_name = ERROR_LOGS_NAME; } if (stream_history){ @@ -293,6 +299,7 @@ void SendableErrorReport::save_report_json(Logger* logger) const{ void SendableErrorReport::move_to_sent(){ // cout << "move_to_sent()" << endl; +#ifdef QT_CORE_LIB QDir().mkdir(QString::fromStdString(ERROR_PATH_SENT)); std::string new_directory = ERROR_PATH_SENT + "/" + m_timestamp + "/"; @@ -308,11 +315,13 @@ void SendableErrorReport::move_to_sent(){ global_logger_tagged().log("Unable to move error report " + m_timestamp + ".", COLOR_RED); } m_directory = std::move(new_directory); +#endif } std::vector SendableErrorReport::get_pending_reports(){ std::vector ret; +#ifdef QT_CORE_LIB QDir dir(QString::fromStdString(ERROR_PATH_UNSENT)); dir.setFilter(QDir::Filter::AllDirs); QFileInfoList list = dir.entryInfoList(); @@ -323,6 +332,7 @@ std::vector SendableErrorReport::get_pending_reports(){ } ret.emplace_back(std::move(path)); } +#endif return ret; } diff --git a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp index c1092c6cb2..67c4ed76c8 100644 --- a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp +++ b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp @@ -4,7 +4,7 @@ * */ -#include +// #include #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" diff --git a/SerialPrograms/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake index c76d4671b9..31d439f0b6 100644 --- a/SerialPrograms/cmake/SourceFiles.cmake +++ b/SerialPrograms/cmake/SourceFiles.cmake @@ -69,7 +69,6 @@ file(GLOB CORE_LIBRARY_SOURCES ../Common/Cpp/Filesystem/Filesystem.h ../Common/Cpp/Filesystem/Filesystem_Linux.h ../Common/Cpp/Filesystem/Filesystem_Mac.h - ../Common/Cpp/Filesystem/Filesystem_Qt.h ../Common/Cpp/Filesystem/Filesystem_Windows.h ../Common/Cpp/Hardware/Hardware.cpp ../Common/Cpp/Hardware/Hardware.h @@ -233,10 +232,10 @@ file(GLOB CORE_LIBRARY_SOURCES Source/Controllers/Schedulers/ControllerWithScheduler.h Source/Controllers/Schedulers/SuperscalarScheduler.cpp Source/Controllers/Schedulers/SuperscalarScheduler.h - Source/Controllers/SerialPABotBase/Connection/MessageLogger.cpp - Source/Controllers/SerialPABotBase/Connection/MessageLogger.h - Source/Controllers/SerialPABotBase/SerialPABotBase.cpp - Source/Controllers/SerialPABotBase/SerialPABotBase.h + Source/Controllers/SerialPort/SerialPABotBase.cpp + Source/Controllers/SerialPort/SerialPABotBase.h + Source/Controllers/SerialPort/SerialLogger.cpp + Source/Controllers/SerialPort/SerialLogger.h Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.cpp Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.h Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp @@ -311,6 +310,13 @@ file(GLOB CORE_LIBRARY_SOURCES Source/Controllers/ControllerState.cpp Source/Controllers/ControllerState.h + Source/CompileTimeBackends.h + + Source/CommonFramework/GlobalAutoPaths.cpp + Source/CommonFramework/GlobalAutoPaths.h + + Source/CommonFramework/Notifications/ProgramInfo.h + Source/Integrations/PybindSwitchController.cpp Source/Integrations/PybindSwitchController.h @@ -350,6 +356,7 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/DateTime.h ../Common/Cpp/EarlyShutdown.h ../Common/Cpp/EventRateTracker.h + ../Common/Cpp/Filesystem/Filesystem_Qt.h ../Common/Cpp/Logging/OutputRedirector.cpp ../Common/Cpp/Logging/OutputRedirector.h ../Common/Cpp/MemoryUtilization/MemoryUtilization.cpp @@ -549,8 +556,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Exceptions/ProgramFinishedException.cpp Source/CommonFramework/Exceptions/ProgramFinishedException.h Source/CommonFramework/Exceptions/UnexpectedBattleException.h - Source/CommonFramework/GlobalAutoPaths.cpp - Source/CommonFramework/GlobalAutoPaths.h Source/CommonFramework/GlobalServices.cpp Source/CommonFramework/GlobalServices.h Source/CommonFramework/GlobalSettingsPanel.cpp @@ -588,7 +593,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Notifications/EventNotificationWidget.h Source/CommonFramework/Notifications/MessageAttachment.cpp Source/CommonFramework/Notifications/MessageAttachment.h - Source/CommonFramework/Notifications/ProgramInfo.h Source/CommonFramework/Notifications/ProgramNotifications.cpp Source/CommonFramework/Notifications/ProgramNotifications.h Source/CommonFramework/Notifications/SenderNotificationTable.cpp @@ -918,10 +922,6 @@ file(GLOB LIBRARY_SOURCES Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.h Source/Controllers/PABotBase2/SerialPABotBase_StatusThread.h - Source/Controllers/SerialPort/SerialLogger.cpp - Source/Controllers/SerialPort/SerialLogger.h - Source/Controllers/SerialPort/SerialPABotBase.cpp - Source/Controllers/SerialPort/SerialPABotBase.h Source/Controllers/SerialPort/SerialPortPollerQt.cpp Source/Controllers/SerialPort/SerialPortPollerQt.h Source/Controllers/StandardHid/StandardHid_Keyboard.cpp @@ -1329,7 +1329,6 @@ file(GLOB LIBRARY_SOURCES Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.h Source/NintendoSwitch/Programs/NintendoSwitch_VirtualConsole.cpp Source/NintendoSwitch/Programs/NintendoSwitch_VirtualConsole.h - Source/CompileTimeBackends.h Source/PanelLists.cpp Source/PanelLists.h Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp From 7691fe9155e4975286b4030079ce0a318f28ca04 Mon Sep 17 00:00:00 2001 From: jw098 Date: Sat, 29 Aug 2026 19:53:37 -0700 Subject: [PATCH 03/11] recombine ResourceDownloadHelpersQt with ResourceDownloadHelpers --- .../Source/CommonFramework/ProgramSession.cpp | 6 +- .../GlobalResourceDownloadManager.cpp | 1 - .../ResourceDownloadHelpers.cpp | 62 ++++++++++++++++ .../ResourceDownloadHelpers.h | 11 +++ .../ResourceDownloadHelpersQt.cpp | 72 ------------------- .../ResourceDownloadHelpersQt.h | 30 -------- .../SettingsResourceDownloadRow.cpp | 1 - 7 files changed, 78 insertions(+), 105 deletions(-) delete mode 100644 SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpersQt.cpp delete mode 100644 SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpersQt.h diff --git a/SerialPrograms/Source/CommonFramework/ProgramSession.cpp b/SerialPrograms/Source/CommonFramework/ProgramSession.cpp index db1759d215..0e1e84c597 100644 --- a/SerialPrograms/Source/CommonFramework/ProgramSession.cpp +++ b/SerialPrograms/Source/CommonFramework/ProgramSession.cpp @@ -17,7 +17,6 @@ #include "CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h" #include "CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h" #include "CommonFramework/ResourceDownload/ResourceDownloadHelpers.h" -#include "CommonFramework/ResourceDownload/ResourceDownloadHelpersQt.h" #include "Integrations/ProgramTracker.h" namespace PokemonAutomation{ @@ -298,8 +297,13 @@ RequiredResourceResult ProgramSession::find_missing_resources(){ continue; case ResourceVersionStatus::OUTDATED: case ResourceVersionStatus::NOT_APPLICABLE:{ + // we don't have the resource. check remote to see if correct version is available. + #ifdef QT_CORE_LIB DownloadedResourceMetadata remote_resource = get_remote_resource_metadata_from_resource_slug(resource_type); + #else + DownloadedResourceMetadata remote_resource = DownloadedResourceMetadata{}; // placeholder when no Qt + #endif DownloadedResourceMetadata expected_resource = get_expected_resource_metadata_from_resource_slug(resource_type); uint16_t expected_version_num = expected_resource.version_num.value(); uint16_t remote_version_num = remote_resource.version_num.value(); diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp index 41cc4980d5..c5a269d5e1 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp @@ -8,7 +8,6 @@ #include "Common/Cpp/Exceptions.h" #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/ResourceDownload/ResourceDownloadHelpers.h" -#include "CommonFramework/ResourceDownload/ResourceDownloadHelpersQt.h" #include "CommonFramework/ResourceDownload/ResourceDownload.h" #include "GlobalResourceDownloadManager.h" diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp index 6624904f7c..588f4d0cee 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp @@ -4,9 +4,13 @@ * */ +#ifdef QT_CORE_LIB +#include "CommonFramework/Tools/FileDownloader.h" +#endif #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/Json/JsonArray.h" #include "Common/Cpp/Json/JsonObject.h" +#include "Common/Cpp/Json/JsonValue.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/Exceptions/OperationFailedException.h" @@ -162,4 +166,62 @@ const std::unordered_set& all_resource_names(){ } + + + +JsonValue fetch_resource_download_list_json_from_remote(){ + Logger& logger = global_logger_tagged(); +#ifdef QT_CORE_LIB + JsonValue json = + FileDownloader::download_json_file( + logger, + "https://raw.githubusercontent.com/PokemonAutomation/Packages/refs/heads/master/Resources/ResourceDownloadList.json" + ); +#else + JsonValue json; // placeholder when no Qt +#endif + + return json; +} + + +const JsonValue& remote_resource_download_list_json(){ + static const JsonValue json = fetch_resource_download_list_json_from_remote(); + + return json; +} + +const std::vector& remote_resource_download_list(){ + // cout << "remote_resource_download_list" << endl; + static std::vector remote_resources = deserialize_resource_list_json(remote_resource_download_list_json()); + + return remote_resources; +} + +DownloadedResourceMetadata get_remote_resource_metadata_from_resource_slug(const std::string& target_resource_slug){ + Logger& logger = global_logger_tagged(); + std::vector remote_resources; + + // Step 1: Attempt to fetch the list of available downloads + try{ + remote_resources = remote_resource_download_list(); + }catch(OperationFailedException&){ + std::cerr << "get_remote_resource_metadata_from_resource_slug: Error" << endl; + throw_and_log(logger, ErrorReport::NO_ERROR_REPORT, + "Error: Download failed. Failed to fetch the list of available downloads. Check your internet connection."); + } + + // Step 2: Attempt to extract metadata for the specific slug + try{ + return get_resource_metadata_from_resource_type(target_resource_slug, remote_resources); + }catch(OperationFailedException&){ + std::cerr << "get_remote_resource_metadata_from_resource_slug: Error" << endl; + throw_and_log(logger, ErrorReport::NO_ERROR_REPORT, + "get_remote_resource_metadata_from_resource_slug: Unable to find " + target_resource_slug + " within resource_list. " + "Likely caused by resource being no longer available for download. We recommend updating the Computer Control program."); + } +} + + + } diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.h b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.h index 52776882d2..52861bb414 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.h +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.h @@ -72,5 +72,16 @@ DownloadedResourceMetadata get_expected_resource_metadata_from_resource_slug(con const std::unordered_set& all_resource_names(); + + +const std::vector& remote_resource_download_list(); + + +// - throws OperationFailedException if target_resource_slug isn't found within remote_resource_download_list +// this would indicate that CC is out of date. +// - also throws OperationFailedException if Internet is not turned on. +DownloadedResourceMetadata get_remote_resource_metadata_from_resource_slug(const std::string& target_resource_slug); + + } #endif diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpersQt.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpersQt.cpp deleted file mode 100644 index 8e6a058931..0000000000 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpersQt.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* Resource Download Helpers using Qt headers - * - * From: https://github.com/PokemonAutomation/ - * - */ - -#include "CommonFramework/Logging/Logger.h" -#include "CommonFramework/Exceptions/OperationFailedException.h" -#include "Common/Cpp/Json/JsonValue.h" -#include "CommonFramework/Tools/FileDownloader.h" -#include "ResourceDownloadHelpersQt.h" - - -#include -using std::cout; -using std::endl; - -namespace PokemonAutomation{ - - -JsonValue fetch_resource_download_list_json_from_remote(){ - Logger& logger = global_logger_tagged(); - JsonValue json = - FileDownloader::download_json_file( - logger, - "https://raw.githubusercontent.com/PokemonAutomation/Packages/refs/heads/master/Resources/ResourceDownloadList.json" - ); - - return json; -} - - -const JsonValue& remote_resource_download_list_json(){ - static const JsonValue json = fetch_resource_download_list_json_from_remote(); - - return json; -} - -const std::vector& remote_resource_download_list(){ - // cout << "remote_resource_download_list" << endl; - static std::vector remote_resources = deserialize_resource_list_json(remote_resource_download_list_json()); - - return remote_resources; -} - -DownloadedResourceMetadata get_remote_resource_metadata_from_resource_slug(const std::string& target_resource_slug){ - Logger& logger = global_logger_tagged(); - std::vector remote_resources; - - // Step 1: Attempt to fetch the list of available downloads - try{ - remote_resources = remote_resource_download_list(); - }catch(OperationFailedException&){ - std::cerr << "get_remote_resource_metadata_from_resource_slug: Error" << endl; - throw_and_log(logger, ErrorReport::NO_ERROR_REPORT, - "Error: Download failed. Failed to fetch the list of available downloads. Check your internet connection."); - } - - // Step 2: Attempt to extract metadata for the specific slug - try{ - return get_resource_metadata_from_resource_type(target_resource_slug, remote_resources); - }catch(OperationFailedException&){ - std::cerr << "get_remote_resource_metadata_from_resource_slug: Error" << endl; - throw_and_log(logger, ErrorReport::NO_ERROR_REPORT, - "get_remote_resource_metadata_from_resource_slug: Unable to find " + target_resource_slug + " within resource_list. " - "Likely caused by resource being no longer available for download. We recommend updating the Computer Control program."); - } -} - - - -} diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpersQt.h b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpersQt.h deleted file mode 100644 index 43753d2564..0000000000 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpersQt.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Resource Download Helpers using Qt headers - * - * From: https://github.com/PokemonAutomation/ - * - */ - -#ifndef PokemonAutomation_ResourceDownloadHelpersQt_H -#define PokemonAutomation_ResourceDownloadHelpersQt_H - -#include -#include -#include -#include -#include "ResourceDownloadHelpers.h" - - -namespace PokemonAutomation{ - - -const std::vector& remote_resource_download_list(); - - -// - throws OperationFailedException if target_resource_slug isn't found within remote_resource_download_list -// this would indicate that CC is out of date. -// - also throws OperationFailedException if Internet is not turned on. -DownloadedResourceMetadata get_remote_resource_metadata_from_resource_slug(const std::string& target_resource_slug); - - -} -#endif diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.cpp index 1026e1eeb4..af72a95597 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.cpp @@ -17,7 +17,6 @@ #include "CommonFramework/Logging/Logger.h" #include "CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h" #include "ResourceDownloadHelpers.h" -#include "ResourceDownloadHelpersQt.h" // #include "SettingsResourceDownloadTable.h" #include "SettingsResourceDownloadRow.h" From 3ba5277f5d173c7585239278bc7e845bf9ac837c Mon Sep 17 00:00:00 2001 From: jw098 Date: Sat, 29 Aug 2026 23:13:23 -0700 Subject: [PATCH 04/11] complete Core library --- .../miniz-3.1.1/miniz.c | 0 .../miniz-3.1.1/miniz.h | 0 SerialPrograms/CMakeLists.txt | 4 +- .../CommandLine/CommandLineExecutable.cmake | 6 +- .../AudioPipeline/AudioInfo.cpp | 10 +- .../CommonFramework/AudioPipeline/AudioInfo.h | 10 +- .../AudioPipeline/AudioPassthroughPair.h | 24 +- .../AudioPipeline/AudioSession.cpp | 6 + .../CommonFramework/ImageTypes/ImageRGB32.cpp | 3 + .../Notifications/MessageAttachment.cpp | 11 +- .../Environment/ThemeSelectorOption.cpp | 4 + .../CommonFramework/Panels/PanelInstance.h | 4 + .../CommonFramework/Panels/SettingsPanel.h | 2 + .../ProgramStats/StatsDatabase.cpp | 8 + .../Recording/StreamHistorySession.cpp | 5 + .../Recording/StreamHistorySession.h | 3 +- .../Recording/StreamHistoryTracker_Null.h | 4 + .../ResourceDownload/DownloadThread.cpp | 2 + .../Backends/CameraImplementations.cpp | 10 +- .../VideoPipeline/VideoSession.cpp | 5 +- .../VideoPipeline/VideoSession.h | 2 + .../VideoPipeline/VideoSourceDescriptor.cpp | 6 + .../CommonFramework/Windows/DpiScaler.cpp | 14 +- .../CommonFramework/Windows/DpiScaler.h | 5 +- .../CommonFramework/Windows/MainWindow.cpp | 1 + .../DiscordIntegrationSettings.cpp | 7 + .../Integrations/DiscordIntegrationSettings.h | 1 - .../Integrations/DiscordSettingsOption.cpp | 1 - .../Source/Integrations/DiscordWebhook.cpp | 12 +- .../Source/Integrations/DiscordWebhook.h | 6 +- SerialPrograms/cmake/SourceFiles.cmake | 425 ++++++++---------- 31 files changed, 333 insertions(+), 268 deletions(-) rename {3rdParty => 3rdParty-Core}/miniz-3.1.1/miniz.c (100%) rename {3rdParty => 3rdParty-Core}/miniz-3.1.1/miniz.h (100%) diff --git a/3rdParty/miniz-3.1.1/miniz.c b/3rdParty-Core/miniz-3.1.1/miniz.c similarity index 100% rename from 3rdParty/miniz-3.1.1/miniz.c rename to 3rdParty-Core/miniz-3.1.1/miniz.c diff --git a/3rdParty/miniz-3.1.1/miniz.h b/3rdParty-Core/miniz-3.1.1/miniz.h similarity index 100% rename from 3rdParty/miniz-3.1.1/miniz.h rename to 3rdParty-Core/miniz-3.1.1/miniz.h diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt index cab1fa7ff4..73220503ee 100644 --- a/SerialPrograms/CMakeLists.txt +++ b/SerialPrograms/CMakeLists.txt @@ -262,10 +262,10 @@ apply_common_target_properties(SerialProgramsLib) apply_common_target_properties(SerialPrograms) if(MSVC) - set_source_files_properties("../3rdParty/miniz-3.1.1/miniz.c" PROPERTIES COMPILE_FLAGS "/W0") + set_source_files_properties("../3rdParty-Core/miniz-3.1.1/miniz.c" PROPERTIES COMPILE_FLAGS "/W0") else() # For GCC/Clang - set_source_files_properties("../3rdParty/miniz-3.1.1/miniz.c" PROPERTIES COMPILE_FLAGS "-w") + set_source_files_properties("../3rdParty-Core/miniz-3.1.1/miniz.c" PROPERTIES COMPILE_FLAGS "-w") endif() # REPO_ROOT_DIR: the root folder of the git repository, "Arduino-Source/" diff --git a/SerialPrograms/Source/CommandLine/CommandLineExecutable.cmake b/SerialPrograms/Source/CommandLine/CommandLineExecutable.cmake index cb87e5d7ae..255601d68f 100644 --- a/SerialPrograms/Source/CommandLine/CommandLineExecutable.cmake +++ b/SerialPrograms/Source/CommandLine/CommandLineExecutable.cmake @@ -10,11 +10,11 @@ set(COMMANDLINE_SOURCES add_executable(SerialProgramsCommandLine ${COMMANDLINE_SOURCES}) # Link to SerialProgramsLib (contains all the core functionality) -target_link_libraries(SerialProgramsCommandLine PRIVATE SerialProgramsLib) +target_link_libraries(SerialProgramsCommandLine PRIVATE CoreLib) # Ensure SerialProgramsCommandLine rebuilds when SerialProgramsLib is updated -add_dependencies(SerialProgramsCommandLine SerialProgramsLib) +add_dependencies(SerialProgramsCommandLine CoreLib) # Apply common target properties (includes, compile flags, etc.) # This function is defined in the parent CMakeLists.txt -apply_common_target_properties(SerialProgramsCommandLine) +apply_common_target_properties(SerialProgramsCommandLine NO_GUI) diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp index 71bc015170..ac5d3a7d9f 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp @@ -5,7 +5,9 @@ */ #include +#ifdef QT_CORE_LIB #include +#endif #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Time.h" #include "Common/Cpp/PrettyPrint.h" @@ -19,7 +21,7 @@ //using std::cout; //using std::endl; - +#ifdef QT_CORE_LIB #if QT_VERSION_MAJOR == 5 #include #elif QT_VERSION_MAJOR == 6 @@ -28,6 +30,7 @@ #else #error "Unsupported Qt version." #endif +#endif #if QT_VERSION_MAJOR != 5 @@ -49,6 +52,7 @@ const char* AUDIO_FORMAT_LABELS[] = { "1 x 96,000 Hz (Interleaved Stereo R/L)", }; +#ifdef QT_CORE_LIB void set_format(QAudioFormat& native_format, AudioChannelFormat format){ switch (format){ case AudioChannelFormat::MONO_48000: @@ -301,7 +305,7 @@ std::vector supported_output_formats(int& preferred_index, c return ret; } - +#endif @@ -524,6 +528,7 @@ const std::vector& AudioDeviceInfo::supported_formats() cons int AudioDeviceInfo::preferred_format_index() const{ return m_body->preferred_format_index; } +#ifdef QT_CORE_LIB QAudioFormat AudioDeviceInfo::preferred_format() const{ QAudioFormat format = native_info().preferredFormat(); int index = preferred_format_index(); @@ -535,6 +540,7 @@ QAudioFormat AudioDeviceInfo::preferred_format() const{ const NativeAudioInfo& AudioDeviceInfo::native_info() const{ return m_body->info; } +#endif bool AudioDeviceInfo::operator==(const AudioDeviceInfo& info) const{ return device_name() == info.device_name(); } diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h index 3a15adff71..265e6db9b9 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h @@ -9,9 +9,10 @@ #include #include -#include #include "Common/Cpp/Containers/Pimpl.h" +#ifdef QT_CORE_LIB +#include class QAudioFormat; #if QT_VERSION_MAJOR == 5 @@ -23,6 +24,7 @@ using NativeAudioInfo = QAudioDevice; #else #error "Unknown Qt version." #endif +#endif @@ -51,11 +53,12 @@ enum class AudioChannelFormat{ }; extern const char* AUDIO_FORMAT_LABELS[]; +#ifdef QT_CORE_LIB // Set the QAudioFormat to the our audio format enum. void set_format(QAudioFormat& native_format, AudioChannelFormat format); - AudioSampleFormat get_sample_format(QAudioFormat& native_format); +#endif @@ -77,9 +80,12 @@ class AudioDeviceInfo{ const std::vector& supported_formats() const; int preferred_format_index() const; + #ifdef QT_CORE_LIB QAudioFormat preferred_format() const; const NativeAudioInfo& native_info() const; + #endif + bool operator==(const AudioDeviceInfo& info) const; diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h index c0b4a2bd99..69f0714cd8 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h @@ -25,11 +25,11 @@ struct FFTListener; // class AudioPassthroughPair{ public: - virtual void add_listener(AudioFloatStreamListener& listener) = 0; - virtual void remove_listener(AudioFloatStreamListener& listener) = 0; + virtual void add_listener(AudioFloatStreamListener& listener) {} + virtual void remove_listener(AudioFloatStreamListener& listener) {} - virtual void add_listener(FFTListener& listener) = 0; - virtual void remove_listener(FFTListener& listener) = 0; + virtual void add_listener(FFTListener& listener) {} + virtual void remove_listener(FFTListener& listener) {} public: virtual ~AudioPassthroughPair() = default; @@ -37,20 +37,20 @@ class AudioPassthroughPair{ virtual void reset( const std::string& file, const AudioDeviceInfo& output, double output_volume - ) = 0; + ) {} virtual void reset( const AudioDeviceInfo& input, AudioChannelFormat format, const AudioDeviceInfo& output, double output_volume - ) = 0; + ) {} - virtual void clear_audio_source() = 0; - virtual void set_audio_source(const std::string& file) = 0; - virtual void set_audio_source(const AudioDeviceInfo& device, AudioChannelFormat format) = 0; + virtual void clear_audio_source() {} + virtual void set_audio_source(const std::string& file) {} + virtual void set_audio_source(const AudioDeviceInfo& device, AudioChannelFormat format) {} - virtual void clear_audio_sink() = 0; - virtual void set_audio_sink(const AudioDeviceInfo& device, double volume) = 0; + virtual void clear_audio_sink() {} + virtual void set_audio_sink(const AudioDeviceInfo& device, double volume) {} - virtual void set_sink_volume(double volume) = 0; // Volume Range: [0, 1.0] + virtual void set_sink_volume(double volume) {} // Volume Range: [0, 1.0] }; diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.cpp index 5483a94c9d..6a26866e7b 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.cpp @@ -7,7 +7,9 @@ #include "Common/Cpp/Logging/AbstractLogger.h" #include "CommonFramework/GlobalServices.h" #include "CommonFramework/GlobalSettingsPanel.h" +#ifdef QT_CORE_LIB #include "Backends/AudioPassthroughPairQtThread.h" +#endif #include "AudioPipelineOptions.h" #include "AudioSession.h" @@ -46,7 +48,11 @@ void AudioSession::remove_spectrum_listener(AudioSpectrumHolder::Listener& liste AudioSession::AudioSession(Logger& logger, AudioOption& option) : m_logger(logger) , m_option(option) + #ifdef QT_CORE_LIB , m_devices(new AudioPassthroughPairQtThread(logger)) + #else + , m_devices(new AudioPassthroughPair()) + #endif { AudioSession::reset(); m_devices->add_listener(*this); diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp index a79a998f36..656811cdc0 100644 --- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp +++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp @@ -65,6 +65,9 @@ ImageRGB32::ImageRGB32(const std::string& filename){ *this = OpenCV_load_image(filename); } #endif +#ifdef PA_IMAGE_BACKEND_None +ImageRGB32::ImageRGB32(const std::string& filename){} +#endif ImageRGB32::ImageRGB32(std::unique_ptr image) : m_custom_owner(std::move(image)) diff --git a/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.cpp b/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.cpp index 341d7bd70c..b0da257bab 100644 --- a/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.cpp +++ b/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.cpp @@ -4,8 +4,10 @@ * */ +#ifdef QT_CORE_LIB #include #include +#endif #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/GlobalSettingsPanel.h" @@ -38,17 +40,22 @@ PendingFileSend::~PendingFileSend(){ if (m_extend_lifetime.load(std::memory_order_acquire)){ return; } - +#ifdef QT_CORE_LIB QFile file(QString::fromStdString(m_filepath)); file.remove(); +#endif } PendingFileSend::PendingFileSend(const std::string& file, bool keep_file) : m_keep_file(keep_file) , m_extend_lifetime(false) , m_filepath(file) { + #ifdef QT_CORE_LIB QFileInfo info(QString::fromStdString(file)); m_filename = info.fileName().toStdString(); + #else + m_filename = ""; + #endif } PendingFileSend::PendingFileSend(Logger& logger, const ImageAttachment& image) : m_keep_file(image.keep_file) @@ -80,7 +87,9 @@ PendingFileSend::PendingFileSend(Logger& logger, const ImageAttachment& image) m_filepath = SCREENSHOTS_PATH() + m_filename; }else{ m_filepath = GlobalSettings::instance().TEMP_FOLDER; + #ifdef QT_CORE_LIB QDir().mkdir(QString::fromStdString(m_filepath)); + #endif m_filepath += m_filename; } diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp index b927e27fe6..3f8c38a3c6 100644 --- a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp @@ -4,9 +4,11 @@ * */ +#ifdef QT_CORE_LIB #include #include #include +#endif #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Windows/DpiScaler.h" #include "ThemeSelectorOption.h" @@ -16,6 +18,7 @@ namespace PokemonAutomation{ void set_theme(UiThemeMode theme_mode){ +#ifdef QT_CORE_LIB if (theme_mode == CURRENT_THEME){ return; } @@ -41,6 +44,7 @@ void set_theme(UiThemeMode theme_mode){ app->setStyleSheet(stylesheet); CURRENT_THEME = theme_mode; +#endif } diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h b/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h index f224633189..e4909d9f8d 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h +++ b/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h @@ -10,7 +10,9 @@ #include "Common/Compiler.h" #include "PanelDescriptor.h" +#ifdef QT_CORE_LIB class QWidget; +#endif namespace PokemonAutomation{ @@ -32,10 +34,12 @@ class PanelInstance{ void validate_resource_list(); +#ifdef QT_CORE_LIB public: // The implmentation is defined in "UI/PanelWidget.h" to avoid circular dependency // Returns a UI/PanelWidget.h:PanelWidget virtual QWidget* make_widget(QWidget& parent, PanelHolder& holder); +#endif public: // Serialization diff --git a/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.h b/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.h index 5f8b754ead..f6e3be7909 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.h +++ b/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.h @@ -23,7 +23,9 @@ class SettingsPanelInstance : public PanelInstance{ m_options.add_option(option, std::move(serialization_string)); } +#ifdef QT_CORE_LIB virtual QWidget* make_widget(QWidget& parent, PanelHolder& holder) override; +#endif public: // Serialization diff --git a/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp index aa7125bf00..8ed0dea50b 100644 --- a/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp +++ b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp @@ -4,8 +4,10 @@ * */ +#ifdef QT_CORE_LIB #include #include +#endif #include "Common/Cpp/Time.h" #include "StatsDatabase.h" @@ -135,13 +137,16 @@ std::string StatSet::to_str() const{ } void StatSet::save_to_file(const std::string& filepath){ + #ifdef QT_CORE_LIB QFile file(QString::fromStdString(filepath)); if (file.open(QIODevice::WriteOnly)){ std::string data = to_str(); file.write(data.c_str(), data.size()); } + #endif } void StatSet::open_from_file(const std::string& filepath){ + #ifdef QT_CORE_LIB QFile file(QString::fromStdString(filepath)); if (!file.open(QIODevice::ReadOnly)){ return; @@ -149,6 +154,7 @@ void StatSet::open_from_file(const std::string& filepath){ std::string str = file.readAll().data(); load_from_string(str.c_str()); + #endif } bool StatSet::update_file( @@ -156,6 +162,7 @@ bool StatSet::update_file( const std::string& identifier, StatsTracker& tracker ){ + #ifdef QT_CORE_LIB QFile file(QString::fromStdString(filepath)); while (!file.open(QIODevice::ReadWrite)){ return false; @@ -171,6 +178,7 @@ bool StatSet::update_file( file.seek(0); file.write(data.c_str(), data.size()); file.resize(data.size()); + #endif return true; } diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp index a692d6f7c6..fd4ef1bd22 100644 --- a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp +++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp @@ -8,7 +8,9 @@ #include "Common/Cpp/Containers/Pimpl.tpp" #include "Common/Cpp/Concurrency/SpinLock.h" #include "CommonFramework/GlobalSettingsPanel.h" +#ifdef QT_CORE_LIB #include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h" +#endif #include "CommonFramework/Recording/StreamHistoryOption.h" #if (QT_VERSION_MAJOR == 6) && (QT_VERSION_MINOR >= 8) @@ -98,6 +100,8 @@ void StreamHistorySession::on_samples(const float* samples, size_t frames){ data.m_current->on_samples(samples, frames); } } + +#ifdef QT_CORE_LIB void StreamHistorySession::on_frame(std::shared_ptr frame){ Data& data = *m_data; WriteSpinLock lg(data.m_lock); @@ -105,6 +109,7 @@ void StreamHistorySession::on_frame(std::shared_ptr frame){ data.m_current->on_frame(std::move(frame)); } } +#endif void StreamHistorySession::clear(){ diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.h b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.h index f6379d414c..723bb1f2cb 100644 --- a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.h +++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.h @@ -31,8 +31,9 @@ class StreamHistorySession public: virtual void on_samples(const float* data, size_t frames) override; +#ifdef QT_CORE_LIB virtual void on_frame(std::shared_ptr frame) override; - +#endif public: virtual void pre_input_change() override; virtual void post_input_change(const std::string& file, const AudioDeviceInfo& device, AudioChannelFormat format) override; diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_Null.h b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_Null.h index 3febaba31f..dc4e9c99ba 100644 --- a/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_Null.h +++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_Null.h @@ -11,7 +11,9 @@ #include "Common/Compiler.h" #include "Common/Cpp/Logging/AbstractLogger.h" +#ifdef QT_CORE_LIB #include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h" +#endif namespace PokemonAutomation{ @@ -36,7 +38,9 @@ class StreamHistoryTracker{ public: void on_samples(const float* data, size_t frames){} + #ifdef QT_CORE_LIB void on_frame(std::shared_ptr frame){} + #endif private: Logger& m_logger; diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp index 0e149ad8f2..6a54f42b40 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp @@ -105,6 +105,7 @@ void DownloadThread::run_download(DownloadedResourceMetadata resource_metadata){ // download std::string zip_path = resource_directory + "/temp.zip"; + #ifdef QT_CORE_LIB FileDownloader::download_file_to_disk( *this, logger, @@ -115,6 +116,7 @@ void DownloadThread::run_download(DownloadedResourceMetadata resource_metadata){ m_hooks.report_download_progress(bytes_done, total_bytes); } ); + #endif // hash std::string hash = diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp index c820520a67..25eb994b90 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp @@ -3,8 +3,9 @@ * From: https://github.com/PokemonAutomation/ * */ - +#ifdef QT_CORE_LIB #include +#endif //#include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Globals.h" @@ -16,10 +17,11 @@ //using std::cout; //using std::endl; +#ifdef QT_CORE_LIB #include "CameraWidgetQt6.h" #include "CameraWidgetQt6.5.h" #include "CameraWidgetQt6_QQuickWidget.h" - +#endif namespace PokemonAutomation{ @@ -48,8 +50,9 @@ struct CameraBackends{ } CameraBackends(){ + #ifdef QT_CORE_LIB m_backends.emplace_back( - "qt6-QVideoSink", "Qt6: QVideoSink", + "qt6-QVideoSink", "Qt6: QVideoSink", std::make_unique() ); m_backends.emplace_back( @@ -62,6 +65,7 @@ struct CameraBackends{ std::make_unique() ); } + #endif size_t items = 0; for (const auto& item : m_backends){ diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp index 9cda195871..31c86830e4 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp @@ -8,7 +8,9 @@ #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/GlobalServices.h" #include "CommonFramework/VideoPipeline/VideoPipelineOptions.h" +#ifdef QT_CORE_LIB #include "Backends/VideoFrameQt.h" +#endif #include "VideoSources/VideoSource_Null.h" #include "VideoSession.h" @@ -485,7 +487,7 @@ void VideoSession::on_watchdog_timeout(){ reset(); } - +#ifdef QT_CORE_LIB void VideoSession::on_frame(std::shared_ptr frame){ m_frame_listeners.run_method(&VideoFrameListener::on_frame, frame); { @@ -494,6 +496,7 @@ void VideoSession::on_frame(std::shared_ptr frame){ } global_watchdog().delay(*this); } +#endif void VideoSession::on_rendered_frame(WallClock timestamp){ WriteSpinLock lg(m_fps_lock, PA_CURRENT_FUNCTION); m_fps_tracker_rendered.push_event(timestamp); diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h index bb255c8102..9d6a1eaf8c 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h @@ -194,7 +194,9 @@ class VideoSession // This function is thread-safe as it has a lock to prevent concurrent fps calls. // Note the lock does not protect the other frame listeners added by // VideoSession::add_frame_listener(). +#ifdef QT_CORE_LIB virtual void on_frame(std::shared_ptr frame) override; +#endif // Overwrites VideoSource::RenderedFrameListener::on_rendered_frame() // This function is called when the video source finds a new rendered frame so // VideoSession can update its internal fps record. diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp index 357b8ea0f4..bfab15496d 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp @@ -11,7 +11,9 @@ #include "VideoSourceDescriptor.h" #include "VideoSources/VideoSource_Null.h" +#ifdef QT_CORE_LIB #include "VideoSources/VideoSource_StillImage.h" +#endif #include "VideoSources/VideoSource_Camera.h" //#include @@ -52,7 +54,9 @@ std::shared_ptr VideoSourceOption::get_descriptor_from_ca descriptor.reset(new VideoSourceDescriptor_Null()); break; case VideoSourceType::StillImage: + #ifdef QT_CORE_LIB descriptor.reset(new VideoSourceDescriptor_StillImage()); + #endif break; case VideoSourceType::Camera: descriptor.reset(new VideoSourceDescriptor_Camera()); @@ -122,9 +126,11 @@ void VideoSourceOption::load_json(const JsonValue& json){ const JsonValue* params; params = obj->get_value(VIDEO_TYPE_STRINGS.get_string(VideoSourceType::StillImage)); if (params != nullptr){ + #ifdef QT_CORE_LIB auto x = std::make_unique(); x->load_json(*params); m_descriptor_cache[VideoSourceType::StillImage] = std::move(x); + #endif } params = obj->get_value(VIDEO_TYPE_STRINGS.get_string(VideoSourceType::VideoPlayback)); if (params != nullptr){ diff --git a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp index 56f64de14a..7be6d3ee7a 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp +++ b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp @@ -4,8 +4,10 @@ * */ +#ifdef QT_CORE_LIB #include #include +#endif #include "DpiScaler.h" //#include @@ -16,23 +18,31 @@ namespace PokemonAutomation{ int scale_dpi_width(int width){ +#ifdef QT_CORE_LIB int dpi = 96; QScreen* primaryScreen = QGuiApplication::primaryScreen(); if (primaryScreen != nullptr){ dpi = primaryScreen->logicalDotsPerInchX(); } return width * dpi / 96; +#else + return 0; +#endif } int scale_dpi_height(int height){ +#ifdef QT_CORE_LIB int dpi = 96; QScreen* primaryScreen = QGuiApplication::primaryScreen(); if (primaryScreen != nullptr){ dpi = primaryScreen->logicalDotsPerInchY(); } return height * dpi / 96; +#else + return 0; +#endif } - +#ifdef QT_CORE_LIB void scale_dpi_token(QString& str, int dpi){ size_t length = str.length(); if (length < 3){ @@ -57,7 +67,6 @@ void scale_dpi_token(QString& str, int dpi){ str = QString::number(value) + "px"; } - QString scale_dpi_stylesheet(const QString& style_str){ QScreen* primaryScreen = QGuiApplication::primaryScreen(); if (primaryScreen == nullptr){ @@ -90,6 +99,7 @@ QString scale_dpi_stylesheet(const QString& style_str){ // cout << "out.length() = " << out.length() << endl; return out; } +#endif } diff --git a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.h b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.h index 02e27acb0c..5a34eaabce 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.h +++ b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.h @@ -7,8 +7,6 @@ #ifndef PokemonAutomation_DpiScaler_H #define PokemonAutomation_DpiScaler_H -#include -#include namespace PokemonAutomation{ @@ -16,8 +14,9 @@ namespace PokemonAutomation{ int scale_dpi_width(int width); int scale_dpi_height(int height); - +#ifdef QT_CORE_LIB QString scale_dpi_stylesheet(const QString& style_str); +#endif diff --git a/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp b/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp index 8f587a0540..6e8890ff72 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp +++ b/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp @@ -5,6 +5,7 @@ */ #include +#include //#include #include #include diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp index ec1fe03cd2..2263415a38 100644 --- a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp +++ b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp @@ -4,8 +4,11 @@ * */ +#include #include "Common/Cpp/Strings/Unicode.h" +#ifdef QT_CORE_LIB #include "Common/Qt/StringToolsQt.h" +#endif #include "Integrations/DppIntegration/DppClient.h" #include "DiscordIntegrationSettings.h" @@ -167,17 +170,21 @@ std::string convert(const std::string& message){ MessageBuilder::MessageBuilder(const std::vector& message_tags){ + #ifdef QT_CORE_LIB for (const std::string& tag : message_tags){ m_message_tags.insert(to_lower(tag)); } + #endif } bool MessageBuilder::should_send(const std::vector& channel_tags) const{ + #ifdef QT_CORE_LIB for (const std::string& tag : channel_tags){ auto iter = m_message_tags.find(to_lower(tag)); if (iter != m_message_tags.end()){ return true; } } + #endif return false; } std::string MessageBuilder::build_message( diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h index 39591afca0..916ab4455e 100644 --- a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h +++ b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h @@ -13,7 +13,6 @@ #include "Common/Cpp/Options/StringOption.h" #include "Common/Cpp/Options/EnumDropdownOption.h" #include "Common/Cpp/Options/ButtonOption.h" -#include "Common/Qt/Options/GroupWidget.h" #include "DiscordIntegrationTable.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp b/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp index 9787872593..057b5a1482 100644 --- a/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp +++ b/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp @@ -4,7 +4,6 @@ * */ -#include "Common/Qt/Options/BatchWidget.h" #include "CommonFramework/GlobalSettingsPanel.h" #include "DiscordSettingsOption.h" diff --git a/SerialPrograms/Source/Integrations/DiscordWebhook.cpp b/SerialPrograms/Source/Integrations/DiscordWebhook.cpp index 30e58621a6..e44d9dbd01 100644 --- a/SerialPrograms/Source/Integrations/DiscordWebhook.cpp +++ b/SerialPrograms/Source/Integrations/DiscordWebhook.cpp @@ -5,11 +5,13 @@ */ #include +#ifdef QT_CORE_LIB #include #include #include #include #include +#endif #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Logging/GlobalLogger.h" #include "Common/Cpp/Json/JsonArray.h" @@ -29,7 +31,7 @@ namespace Integration{ namespace DiscordWebhook{ - +#ifdef QT_CORE_LIB DiscordWebhookSender::DiscordWebhookSender() : m_logger(global_logger_raw(), "DiscordWebhookSender") , m_stopping(false) @@ -256,7 +258,7 @@ void DiscordWebhookSender::internal_send( std::lock_guard lg(m_send_lock); m_event_loop.reset(); } - +#endif void send_embed( @@ -295,7 +297,7 @@ void send_embed( if (!embeds.empty()){ json["embeds"] = embeds.clone(); } - + #ifdef QT_CORE_LIB DiscordWebhookSender::instance().send( logger, QString::fromStdString(url.url), @@ -303,6 +305,7 @@ void send_embed( std::move(json), file ); + #endif } } @@ -342,7 +345,7 @@ void send_embed( if (!embeds.empty()){ json["embeds"] = embeds.clone(); } - + #ifdef QT_CORE_LIB DiscordWebhookSender::instance().send( logger, QString::fromStdString(url.url), @@ -350,6 +353,7 @@ void send_embed( std::move(json), files ); + #endif } } diff --git a/SerialPrograms/Source/Integrations/DiscordWebhook.h b/SerialPrograms/Source/Integrations/DiscordWebhook.h index 425d3ac7f3..b1b162e781 100644 --- a/SerialPrograms/Source/Integrations/DiscordWebhook.h +++ b/SerialPrograms/Source/Integrations/DiscordWebhook.h @@ -8,7 +8,9 @@ #define PokemonAutomation_DiscordWebhook_H #include +#ifdef QT_CORE_LIB #include +#endif #include "Common/Cpp/Time.h" #include "Common/Cpp/Concurrency/Mutex.h" #include "Common/Cpp/Concurrency/ConditionVariable.h" @@ -32,7 +34,7 @@ struct DiscordFileAttachment{ std::string filepath; }; - +#ifdef QT_CORE_LIB class DiscordWebhookSender : public QObject{ Q_OBJECT @@ -88,7 +90,7 @@ class DiscordWebhookSender : public QObject{ std::deque m_sent; ScheduledTaskRunner m_queue; }; - +#endif diff --git a/SerialPrograms/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake index 31d439f0b6..5d3f820fa7 100644 --- a/SerialPrograms/cmake/SourceFiles.cmake +++ b/SerialPrograms/cmake/SourceFiles.cmake @@ -8,11 +8,13 @@ set(EXECUTABLE_SOURCES "Source/CommonFramework/Main.cpp" ${DARK_STYLE_RES}) # Note: Command-line executable sources are defined in Source/CommandLine/CommandLineExecutable.cmake file(GLOB CORE_LIBRARY_SOURCES - ../Common/ControllerStates/StandardHid_Keyboard_State.c + ../3rdParty-Core/miniz-3.1.1/miniz.c + ../3rdParty-Core/miniz-3.1.1/miniz.h ../Common/Compiler.h ../Common/ControllerStates/NintendoSwitch_OemController_State.cpp ../Common/ControllerStates/NintendoSwitch_OemController_State.h ../Common/ControllerStates/NintendoSwitch_WiredController_State.h + ../Common/ControllerStates/StandardHid_Keyboard_State.c ../Common/ControllerStates/StandardHid_Keyboard_State.h ../Common/Cpp/CancellableScope.cpp ../Common/Cpp/CancellableScope.h @@ -27,16 +29,24 @@ file(GLOB CORE_LIBRARY_SOURCES ../Common/Cpp/Concurrency/Backends/ThreadPool_Default.h ../Common/Cpp/Concurrency/ConditionVariable.h ../Common/Cpp/Concurrency/Mutex.h + ../Common/Cpp/Concurrency/PeriodicRunner.cpp + ../Common/Cpp/Concurrency/PeriodicRunner.h ../Common/Cpp/Concurrency/Qt6.9ThreadBugWorkaround.h ../Common/Cpp/Concurrency/ReverseLockGuard.h + ../Common/Cpp/Concurrency/ScheduledTaskRunner.cpp + ../Common/Cpp/Concurrency/ScheduledTaskRunner.h ../Common/Cpp/Concurrency/SpinLock.cpp ../Common/Cpp/Concurrency/SpinLock.h ../Common/Cpp/Concurrency/SpinPause.h ../Common/Cpp/Concurrency/Thread.cpp ../Common/Cpp/Concurrency/Thread.h ../Common/Cpp/Concurrency/ThreadPool.h + ../Common/Cpp/Concurrency/Watchdog.cpp + ../Common/Cpp/Concurrency/Watchdog.h ../Common/Cpp/Containers/AlignedMalloc.cpp ../Common/Cpp/Containers/AlignedMalloc.h + ../Common/Cpp/Containers/AlignedVector.h + ../Common/Cpp/Containers/AlignedVector.tpp ../Common/Cpp/Containers/CircularBuffer.h ../Common/Cpp/Containers/FixedLimitVector.h ../Common/Cpp/Containers/FixedLimitVector.tpp @@ -56,7 +66,9 @@ file(GLOB CORE_LIBRARY_SOURCES ../Common/Cpp/CpuUtilization/CpuUtilization_Windows.tpp ../Common/Cpp/Cryptography/SHA256.cpp ../Common/Cpp/Cryptography/SHA256.h + ../Common/Cpp/EarlyShutdown.h ../Common/Cpp/EnumStringMap.h + ../Common/Cpp/EventRateTracker.h ../Common/Cpp/Exceptions.cpp ../Common/Cpp/Exceptions.h ../Common/Cpp/ExpressionEvaluator.cpp @@ -76,6 +88,8 @@ file(GLOB CORE_LIBRARY_SOURCES ../Common/Cpp/Hardware/Hardware_x86.tpp ../Common/Cpp/Hardware/Hardware_x86_Linux.tpp ../Common/Cpp/Hardware/Hardware_x86_Windows.tpp + ../Common/Cpp/ImageResolution.cpp + ../Common/Cpp/ImageResolution.h ../Common/Cpp/Json/JsonArray.cpp ../Common/Cpp/Json/JsonArray.h ../Common/Cpp/Json/JsonObject.cpp @@ -113,13 +127,19 @@ file(GLOB CORE_LIBRARY_SOURCES ../Common/Cpp/Options/EnumDropdownDatabase.h ../Common/Cpp/Options/EnumDropdownOption.cpp ../Common/Cpp/Options/EnumDropdownOption.h + ../Common/Cpp/Options/FloatingPointOption.cpp + ../Common/Cpp/Options/FloatingPointOption.h ../Common/Cpp/Options/GroupOption.cpp ../Common/Cpp/Options/GroupOption.h + ../Common/Cpp/Options/KeyboardLayoutOption.cpp + ../Common/Cpp/Options/KeyboardLayoutOption.h ../Common/Cpp/Options/MacAddressOption.cpp ../Common/Cpp/Options/MacAddressOption.h ../Common/Cpp/Options/SimpleIntegerOption.cpp ../Common/Cpp/Options/SimpleIntegerOption.h ../Common/Cpp/Options/SimpleIntegerOptionBase.h + ../Common/Cpp/Options/StaticTableOption.cpp + ../Common/Cpp/Options/StaticTableOption.h ../Common/Cpp/Options/StaticTextOption.cpp ../Common/Cpp/Options/StaticTextOption.h ../Common/Cpp/Options/StringOption.cpp @@ -131,6 +151,7 @@ file(GLOB CORE_LIBRARY_SOURCES ../Common/Cpp/PrettyPrint.cpp ../Common/Cpp/PrettyPrint.h ../Common/Cpp/RecursiveThrottler.h + ../Common/Cpp/ScopeExit.h ../Common/Cpp/SerialConnection/SerialConnection.cpp ../Common/Cpp/SerialConnection/SerialConnection.h ../Common/Cpp/SerialConnection/SerialConnectionPOSIX.h @@ -141,6 +162,8 @@ file(GLOB CORE_LIBRARY_SOURCES ../Common/Cpp/StreamConnections/PollingStreamConnections.h ../Common/Cpp/StreamConnections/PushingStreamConnections.h ../Common/Cpp/StreamConnections/StreamInterface.h + ../Common/Cpp/StreamConverters.cpp + ../Common/Cpp/StreamConverters.h ../Common/Cpp/Strings/StringTools.cpp ../Common/Cpp/Strings/StringTools.h ../Common/Cpp/Strings/Unicode.cpp @@ -156,6 +179,8 @@ file(GLOB CORE_LIBRARY_SOURCES ../Common/PABotBase2/PABotBase2_MessageProtocol.h ../Common/PABotBase2/PABotBase2CC_MessageDumper.cpp ../Common/PABotBase2/PABotBase2CC_MessageDumper.h + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.h ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.cpp ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.h ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketProtocol.h @@ -166,14 +191,68 @@ file(GLOB CORE_LIBRARY_SOURCES ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.cpp ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h ../Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h + Source/CommonFramework/AudioPipeline/AudioConstants.h + Source/CommonFramework/AudioPipeline/AudioFeed.h + Source/CommonFramework/AudioPipeline/AudioInfo.cpp + Source/CommonFramework/AudioPipeline/AudioInfo.h + Source/CommonFramework/AudioPipeline/AudioOption.cpp + Source/CommonFramework/AudioPipeline/AudioOption.h + Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h + Source/CommonFramework/AudioPipeline/AudioPipelineOptions.h + Source/CommonFramework/AudioPipeline/AudioSession.cpp + Source/CommonFramework/AudioPipeline/AudioSession.h + Source/CommonFramework/AudioPipeline/AudioStream.cpp + Source/CommonFramework/AudioPipeline/AudioStream.h + Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.cpp + Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.h + Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.cpp + Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h + Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.cpp + Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.h Source/CommonFramework/Environment/Environment.cpp Source/CommonFramework/Environment/Environment.h Source/CommonFramework/Environment/Environment_Linux.h Source/CommonFramework/Environment/Environment_Linux.tpp Source/CommonFramework/Environment/Environment_Windows.h Source/CommonFramework/Environment/Environment_Windows.tpp + Source/CommonFramework/Environment/SystemSleep.cpp + Source/CommonFramework/Environment/SystemSleep.h + Source/CommonFramework/Environment/SystemSleep_Apple.tpp + Source/CommonFramework/Environment/SystemSleep_Linux.tpp + Source/CommonFramework/Environment/SystemSleep_Windows.tpp + Source/CommonFramework/ErrorReports/ErrorReports.cpp + Source/CommonFramework/ErrorReports/ErrorReports.h + Source/CommonFramework/ErrorReports/ProgramDumper.cpp + Source/CommonFramework/ErrorReports/ProgramDumper.h + Source/CommonFramework/ErrorReports/ProgramDumper_Windows.tpp + Source/CommonFramework/Exceptions/OperationFailedException.cpp + Source/CommonFramework/Exceptions/OperationFailedException.h + Source/CommonFramework/GlobalAutoPaths.cpp + Source/CommonFramework/GlobalAutoPaths.h + Source/CommonFramework/Globals.cpp + Source/CommonFramework/Globals.h + Source/CommonFramework/GlobalServices.cpp + Source/CommonFramework/GlobalServices.h + Source/CommonFramework/GlobalSettingsPanel.cpp + Source/CommonFramework/GlobalSettingsPanel.h + Source/CommonFramework/ImageTypes/ImageRGB32.cpp + Source/CommonFramework/ImageTypes/ImageRGB32.h + Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp + Source/CommonFramework/ImageTypes/ImageViewPlanar32.h + Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp + Source/CommonFramework/ImageTypes/ImageViewRGB32.h Source/CommonFramework/Logging/Logger.cpp Source/CommonFramework/Logging/Logger.h + Source/CommonFramework/Notifications/EventNotificationOption.cpp + Source/CommonFramework/Notifications/EventNotificationOption.h + Source/CommonFramework/Notifications/EventNotificationsTable.cpp + Source/CommonFramework/Notifications/EventNotificationsTable.h + Source/CommonFramework/Notifications/MessageAttachment.cpp + Source/CommonFramework/Notifications/MessageAttachment.h + Source/CommonFramework/Notifications/ProgramInfo.h + Source/CommonFramework/Notifications/ProgramNotifications.cpp + Source/CommonFramework/Notifications/ProgramNotifications.h + Source/CommonFramework/Options/CheckForUpdatesOption.h Source/CommonFramework/Options/Environment/CoreAffinityOption.cpp Source/CommonFramework/Options/Environment/CoreAffinityOption.h Source/CommonFramework/Options/Environment/PerformanceOptions.cpp @@ -181,18 +260,95 @@ file(GLOB CORE_LIBRARY_SOURCES Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp Source/CommonFramework/Options/Environment/ProcessorLevelOption.h Source/CommonFramework/Options/Environment/ProcessPriorityOption.h + Source/CommonFramework/Options/Environment/SleepSuppressOption.cpp + Source/CommonFramework/Options/Environment/SleepSuppressOption.h + Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp + Source/CommonFramework/Options/Environment/ThemeSelectorOption.h + Source/CommonFramework/Options/LabelCellOption.cpp + Source/CommonFramework/Options/LabelCellOption.h + Source/CommonFramework/Options/ResolutionOption.cpp + Source/CommonFramework/Options/ResolutionOption.h + Source/CommonFramework/Options/ScreenshotFormatOption.h Source/CommonFramework/Options/ThreadPoolOption.cpp Source/CommonFramework/Options/ThreadPoolOption.h + Source/CommonFramework/Panels/PanelDescriptor.cpp + Source/CommonFramework/Panels/PanelDescriptor.h + Source/CommonFramework/Panels/PanelInstance.cpp + Source/CommonFramework/Panels/PanelInstance.h + Source/CommonFramework/Panels/PanelTools.h + Source/CommonFramework/Panels/ProgramDescriptor.cpp + Source/CommonFramework/Panels/ProgramDescriptor.h + Source/CommonFramework/Panels/SettingsPanel.cpp + Source/CommonFramework/Panels/SettingsPanel.h + Source/CommonFramework/PersistentSettings.cpp + Source/CommonFramework/PersistentSettings.h + Source/CommonFramework/ProgramSession.cpp + Source/CommonFramework/ProgramSession.h + Source/CommonFramework/ProgramStats/StatsDatabase.cpp + Source/CommonFramework/ProgramStats/StatsDatabase.h + Source/CommonFramework/ProgramStats/StatsTracking.cpp + Source/CommonFramework/ProgramStats/StatsTracking.h + Source/CommonFramework/Recording/StreamHistoryOption.cpp + Source/CommonFramework/Recording/StreamHistoryOption.h + Source/CommonFramework/Recording/StreamHistorySession.cpp + Source/CommonFramework/Recording/StreamHistorySession.h + Source/CommonFramework/Recording/StreamHistoryTracker_Null.h + Source/CommonFramework/ResourceDownload/DownloadThread.cpp + Source/CommonFramework/ResourceDownload/DownloadThread.h + Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp + Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h + Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.cpp + Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h + Source/CommonFramework/ResourceDownload/ResourceDownload.cpp + Source/CommonFramework/ResourceDownload/ResourceDownload.h + Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp + Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.h + Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp + Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.h + Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.cpp + Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.h + Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp + Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.h Source/CommonFramework/StaticGlobals.cpp Source/CommonFramework/StaticGlobals.h + Source/CommonFramework/Tools/FileHash.cpp + Source/CommonFramework/Tools/FileHash.h + Source/CommonFramework/Tools/FileUnzip.cpp + Source/CommonFramework/Tools/FileUnzip.h Source/CommonFramework/Tools/GlobalThreadPools.cpp Source/CommonFramework/Tools/GlobalThreadPools.h + Source/CommonFramework/Tools/ProgramEnvironment.cpp + Source/CommonFramework/Tools/ProgramEnvironment.h + Source/CommonFramework/Tools/StatAccumulator.cpp + Source/CommonFramework/Tools/StatAccumulator.h + Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp + Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h + Source/CommonFramework/VideoPipeline/CameraInfo.h + Source/CommonFramework/VideoPipeline/VideoFeed.h + Source/CommonFramework/VideoPipeline/VideoFormats.cpp + Source/CommonFramework/VideoPipeline/VideoFormats.h + Source/CommonFramework/VideoPipeline/VideoPipelineOptions.h + Source/CommonFramework/VideoPipeline/VideoSession.cpp + Source/CommonFramework/VideoPipeline/VideoSession.h + Source/CommonFramework/VideoPipeline/VideoSource.cpp + Source/CommonFramework/VideoPipeline/VideoSource.h + Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp + Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.h + Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Camera.cpp + Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Camera.h + Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Null.cpp + Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Null.h + Source/CommonFramework/Windows/DpiScaler.cpp + Source/CommonFramework/Windows/DpiScaler.h Source/CommonTools/Async/InterruptableCommands.cpp Source/CommonTools/Async/InterruptableCommands.h Source/CommonTools/Async/InterruptableCommands.tpp Source/CommonTools/InferenceCallbacks/InferenceCallback.h + Source/CommonTools/Options/StringSelectOption.cpp + Source/CommonTools/Options/StringSelectOption.h Source/CommonTools/Random.cpp Source/CommonTools/Random.h + Source/CompileTimeBackends.h Source/ControllerInput/ControllerInput.cpp Source/ControllerInput/ControllerInput.h Source/ControllerInput/Keyboard/KeyBindingOption.cpp @@ -208,7 +364,11 @@ file(GLOB CORE_LIBRARY_SOURCES Source/Controllers/ControllerDescriptor.h Source/Controllers/ControllerOption.cpp Source/Controllers/ControllerOption.h + Source/Controllers/ControllerSession.cpp + Source/Controllers/ControllerSession.h Source/Controllers/ControllerSettings.h + Source/Controllers/ControllerState.cpp + Source/Controllers/ControllerState.h Source/Controllers/ControllerStatusThread.h Source/Controllers/ControllerTypes.h Source/Controllers/ControllerTypeStrings.cpp @@ -226,28 +386,56 @@ file(GLOB CORE_LIBRARY_SOURCES Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.h Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp Source/Controllers/PABotBase2/PABotBase2_MessageHandler.h + Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp + Source/Controllers/PABotBase2/SerialPABotBase2_Connection.h Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.cpp Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.h Source/Controllers/RumbleListener.h Source/Controllers/Schedulers/ControllerWithScheduler.h Source/Controllers/Schedulers/SuperscalarScheduler.cpp Source/Controllers/Schedulers/SuperscalarScheduler.h - Source/Controllers/SerialPort/SerialPABotBase.cpp - Source/Controllers/SerialPort/SerialPABotBase.h Source/Controllers/SerialPort/SerialLogger.cpp Source/Controllers/SerialPort/SerialLogger.h + Source/Controllers/SerialPort/SerialPABotBase.cpp + Source/Controllers/SerialPort/SerialPABotBase.h + Source/Controllers/StandardHid/StandardHid_Keyboard.cpp + Source/Controllers/StandardHid/StandardHid_Keyboard.h Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.cpp Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.h Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.h + Source/Integrations/DiscordIntegrationSettings.cpp + Source/Integrations/DiscordIntegrationSettings.h + Source/Integrations/DiscordIntegrationTable.cpp + Source/Integrations/DiscordIntegrationTable.h + Source/Integrations/DiscordSettingsOption.cpp + Source/Integrations/DiscordSettingsOption.h + Source/Integrations/DiscordWebhook.cpp + Source/Integrations/DiscordWebhook.h + Source/Integrations/DiscordWebhookSettings.cpp + Source/Integrations/DiscordWebhookSettings.h + Source/Integrations/ProgramTracker.cpp + Source/Integrations/ProgramTracker.h + Source/Integrations/PybindSwitchController.cpp + Source/Integrations/PybindSwitchController.h + Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp + Source/Kernels/AbsFFT/Kernels_AbsFFT.h + Source/Kernels/AudioStreamConversion/AudioStreamConversion.cpp + Source/Kernels/AudioStreamConversion/AudioStreamConversion.h Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h + Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp + Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.h Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.cpp Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.h Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.cpp Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h + Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp + Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.h Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.cpp Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h + Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp + Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.cpp Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.cpp @@ -264,72 +452,17 @@ file(GLOB CORE_LIBRARY_SOURCES Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.h Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.cpp Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.h - - - ../Common/Cpp/ImageResolution.cpp - ../Common/Cpp/ImageResolution.h - - Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.cpp - Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.h - + Source/NintendoSwitch/NintendoSwitch_Settings.cpp + Source/NintendoSwitch/NintendoSwitch_Settings.h + Source/NintendoSwitch/NintendoSwitch_SettingsPanel.cpp + Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.cpp Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h - - Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp - Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.h - - Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp - Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h - - Source/CommonFramework/Globals.cpp - Source/CommonFramework/Globals.h - - Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp - Source/CommonFramework/ImageTypes/ImageViewPlanar32.h - Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp - Source/CommonFramework/ImageTypes/ImageViewRGB32.h - - ../Common/Cpp/Containers/AlignedVector.h - ../Common/Cpp/Containers/AlignedVector.tpp - - Source/CommonFramework/ImageTypes/ImageRGB32.cpp - Source/CommonFramework/ImageTypes/ImageRGB32.h - - Source/CommonTools/Options/StringSelectOption.cpp - Source/CommonTools/Options/StringSelectOption.h - - Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp - Source/Controllers/PABotBase2/SerialPABotBase2_Connection.h - - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.h - - Source/Controllers/StandardHid/StandardHid_Keyboard.cpp - Source/Controllers/StandardHid/StandardHid_Keyboard.h - - Source/Controllers/ControllerState.cpp - Source/Controllers/ControllerState.h - - Source/CompileTimeBackends.h - - Source/CommonFramework/GlobalAutoPaths.cpp - Source/CommonFramework/GlobalAutoPaths.h - - Source/CommonFramework/Notifications/ProgramInfo.h - - - Source/Integrations/PybindSwitchController.cpp - Source/Integrations/PybindSwitchController.h + Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.cpp + Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.h ) file(GLOB LIBRARY_SOURCES - - - - - - ../3rdParty/miniz-3.1.1/miniz.h - ../3rdParty/miniz-3.1.1/miniz.c ../3rdParty/ONNX/OnnxToolsPA.h ../3rdParty/QtWavFile/WavFile.cpp ../3rdParty/QtWavFile/WavFile.h @@ -343,19 +476,11 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/Concurrency/BusyPeriodicRunner.h ../Common/Cpp/Concurrency/FireForgetDispatcher.cpp ../Common/Cpp/Concurrency/FireForgetDispatcher.h - ../Common/Cpp/Concurrency/PeriodicRunner.cpp - ../Common/Cpp/Concurrency/PeriodicRunner.h - ../Common/Cpp/Concurrency/ScheduledTaskRunner.cpp - ../Common/Cpp/Concurrency/ScheduledTaskRunner.h - ../Common/Cpp/Concurrency/Watchdog.cpp - ../Common/Cpp/Concurrency/Watchdog.h ../Common/Cpp/Containers/BoxSet.h ../Common/Cpp/Containers/DllSafeString.h ../Common/Cpp/Containers/SparseArray.cpp ../Common/Cpp/Containers/SparseArray.h ../Common/Cpp/DateTime.h - ../Common/Cpp/EarlyShutdown.h - ../Common/Cpp/EventRateTracker.h ../Common/Cpp/Filesystem/Filesystem_Qt.h ../Common/Cpp/Logging/OutputRedirector.cpp ../Common/Cpp/Logging/OutputRedirector.h @@ -374,18 +499,12 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/Options/DateOption.h ../Common/Cpp/Options/FixedCodeOption.cpp ../Common/Cpp/Options/FixedCodeOption.h - ../Common/Cpp/Options/FloatingPointOption.cpp - ../Common/Cpp/Options/FloatingPointOption.h ../Common/Cpp/Options/IntegerRangeOption.cpp ../Common/Cpp/Options/IntegerRangeOption.h - ../Common/Cpp/Options/KeyboardLayoutOption.cpp - ../Common/Cpp/Options/KeyboardLayoutOption.h ../Common/Cpp/Options/PathOption.cpp ../Common/Cpp/Options/PathOption.h ../Common/Cpp/Options/RandomCodeOption.cpp ../Common/Cpp/Options/RandomCodeOption.h - ../Common/Cpp/Options/StaticTableOption.cpp - ../Common/Cpp/Options/StaticTableOption.h ../Common/Cpp/Options/TextEditOption.cpp ../Common/Cpp/Options/TextEditOption.h ../Common/Cpp/Options/TimeExpressionOption.cpp @@ -394,7 +513,6 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/PrintDebuggers.h ../Common/Cpp/Rectangle.h ../Common/Cpp/Rectangle.tpp - ../Common/Cpp/ScopeExit.h ../Common/Cpp/SIMDDebuggers.h ../Common/Cpp/StreamConnections/MockDevice.cpp ../Common/Cpp/StreamConnections/MockDevice.h @@ -404,8 +522,6 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/Sockets/ClientSocket_POSIX.h ../Common/Cpp/Sockets/ClientSocket_Qt.h ../Common/Cpp/Sockets/ClientSocket_WinSocket.h - ../Common/Cpp/StreamConverters.cpp - ../Common/Cpp/StreamConverters.h ../Common/Cpp/TestRunners/UnitTest.h ../Common/Cpp/TestRunners/UnitTestDatabase.h ../Common/Cpp/TestRunners/ParallelUnitTestRunner.cpp @@ -490,19 +606,7 @@ file(GLOB LIBRARY_SOURCES ../Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h ../Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h ../Common/SerialPABotBase/SerialPABotBase_Protocol.h - Source/CommonFramework/AudioPipeline/AudioConstants.h - Source/CommonFramework/AudioPipeline/AudioFeed.h - Source/CommonFramework/AudioPipeline/AudioInfo.cpp - Source/CommonFramework/AudioPipeline/AudioInfo.h Source/CommonFramework/AudioPipeline/AudioNormalization.h - Source/CommonFramework/AudioPipeline/AudioOption.cpp - Source/CommonFramework/AudioPipeline/AudioOption.h - Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h - Source/CommonFramework/AudioPipeline/AudioPipelineOptions.h - Source/CommonFramework/AudioPipeline/AudioSession.cpp - Source/CommonFramework/AudioPipeline/AudioSession.h - Source/CommonFramework/AudioPipeline/AudioStream.cpp - Source/CommonFramework/AudioPipeline/AudioStream.h Source/CommonFramework/AudioPipeline/AudioTemplate.cpp Source/CommonFramework/AudioPipeline/AudioTemplate.h Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp @@ -515,12 +619,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/AudioPipeline/IO/AudioSink.h Source/CommonFramework/AudioPipeline/IO/AudioSource.cpp Source/CommonFramework/AudioPipeline/IO/AudioSource.h - Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.cpp - Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.h - Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.cpp - Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h - Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.cpp - Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.h Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h Source/CommonFramework/AudioPipeline/Tools/AudioNormalization.h @@ -537,29 +635,13 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Environment/HardwareValidation.h Source/CommonFramework/Environment/HardwareValidation_arm64.tpp Source/CommonFramework/Environment/HardwareValidation_x86.tpp - Source/CommonFramework/Environment/SystemSleep.cpp - Source/CommonFramework/Environment/SystemSleep.h - Source/CommonFramework/Environment/SystemSleep_Apple.tpp - Source/CommonFramework/Environment/SystemSleep_Linux.tpp - Source/CommonFramework/Environment/SystemSleep_Windows.tpp - Source/CommonFramework/ErrorReports/ErrorReports.cpp - Source/CommonFramework/ErrorReports/ErrorReports.h - Source/CommonFramework/ErrorReports/ProgramDumper.cpp - Source/CommonFramework/ErrorReports/ProgramDumper.h - Source/CommonFramework/ErrorReports/ProgramDumper_Windows.tpp Source/CommonFramework/Exceptions/FatalProgramException.cpp Source/CommonFramework/Exceptions/FatalProgramException.h - Source/CommonFramework/Exceptions/OperationFailedException.cpp - Source/CommonFramework/Exceptions/OperationFailedException.h Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h Source/CommonFramework/Exceptions/ProgramFinishedException.cpp Source/CommonFramework/Exceptions/ProgramFinishedException.h Source/CommonFramework/Exceptions/UnexpectedBattleException.h - Source/CommonFramework/GlobalServices.cpp - Source/CommonFramework/GlobalServices.h - Source/CommonFramework/GlobalSettingsPanel.cpp - Source/CommonFramework/GlobalSettingsPanel.h Source/CommonFramework/ImageTools/FloatPixel.cpp Source/CommonFramework/ImageTools/FloatPixel.h Source/CommonFramework/ImageTools/ImageBoxes.cpp @@ -585,47 +667,20 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Logging/OutputRedirector.h Source/CommonFramework/Logging/QueuedLogger.cpp Source/CommonFramework/Logging/QueuedLogger.h - Source/CommonFramework/Notifications/EventNotificationOption.cpp - Source/CommonFramework/Notifications/EventNotificationOption.h - Source/CommonFramework/Notifications/EventNotificationsTable.cpp - Source/CommonFramework/Notifications/EventNotificationsTable.h Source/CommonFramework/Notifications/EventNotificationWidget.cpp Source/CommonFramework/Notifications/EventNotificationWidget.h - Source/CommonFramework/Notifications/MessageAttachment.cpp - Source/CommonFramework/Notifications/MessageAttachment.h - Source/CommonFramework/Notifications/ProgramNotifications.cpp - Source/CommonFramework/Notifications/ProgramNotifications.h Source/CommonFramework/Notifications/SenderNotificationTable.cpp Source/CommonFramework/Notifications/SenderNotificationTable.h Source/CommonFramework/Options/BoxOption.cpp Source/CommonFramework/Options/BoxOption.h - Source/CommonFramework/Options/CheckForUpdatesOption.h Source/CommonFramework/Options/Environment/OnnxOptions.h - Source/CommonFramework/Options/Environment/SleepSuppressOption.cpp - Source/CommonFramework/Options/Environment/SleepSuppressOption.h - Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp - Source/CommonFramework/Options/Environment/ThemeSelectorOption.h - Source/CommonFramework/Options/LabelCellOption.cpp - Source/CommonFramework/Options/LabelCellOption.h Source/CommonFramework/Options/NestedBoxDrawOption.cpp Source/CommonFramework/Options/NestedBoxDrawOption.h Source/CommonFramework/Options/QtWidget/LabelCellWidget.cpp Source/CommonFramework/Options/QtWidget/LabelCellWidget.h - Source/CommonFramework/Options/ResolutionOption.cpp - Source/CommonFramework/Options/ResolutionOption.h - Source/CommonFramework/Options/ScreenshotFormatOption.h Source/CommonFramework/Panels/ConsoleSettingsStretch.h - Source/CommonFramework/Panels/PanelDescriptor.cpp - Source/CommonFramework/Panels/PanelDescriptor.h - Source/CommonFramework/Panels/PanelInstance.cpp - Source/CommonFramework/Panels/PanelInstance.h Source/CommonFramework/Panels/PanelList.cpp Source/CommonFramework/Panels/PanelList.h - Source/CommonFramework/Panels/PanelTools.h - Source/CommonFramework/Panels/ProgramDescriptor.cpp - Source/CommonFramework/Panels/ProgramDescriptor.h - Source/CommonFramework/Panels/SettingsPanel.cpp - Source/CommonFramework/Panels/SettingsPanel.h Source/CommonFramework/Panels/UI/PanelElements.cpp Source/CommonFramework/Panels/UI/PanelElements.h Source/CommonFramework/Panels/UI/PanelListWidget.cpp @@ -634,45 +689,14 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Panels/UI/PanelWidget.h Source/CommonFramework/Panels/UI/SettingsPanelWidget.cpp Source/CommonFramework/Panels/UI/SettingsPanelWidget.h - Source/CommonFramework/PersistentSettings.cpp - Source/CommonFramework/PersistentSettings.h - Source/CommonFramework/ProgramSession.cpp - Source/CommonFramework/ProgramSession.h - Source/CommonFramework/ProgramStats/StatsDatabase.cpp - Source/CommonFramework/ProgramStats/StatsDatabase.h - Source/CommonFramework/ProgramStats/StatsTracking.cpp - Source/CommonFramework/ProgramStats/StatsTracking.h - Source/CommonFramework/Recording/StreamHistoryOption.cpp - Source/CommonFramework/Recording/StreamHistoryOption.h - Source/CommonFramework/Recording/StreamHistorySession.cpp - Source/CommonFramework/Recording/StreamHistorySession.h - Source/CommonFramework/Recording/StreamHistoryTracker_Null.h Source/CommonFramework/Recording/StreamHistoryTracker_ParallelStreams.h Source/CommonFramework/Recording/StreamHistoryTracker_RecordOnTheFly.h Source/CommonFramework/Recording/StreamHistoryTracker_SaveFrames.cpp Source/CommonFramework/Recording/StreamHistoryTracker_SaveFrames.h Source/CommonFramework/Recording/StreamRecorder.cpp Source/CommonFramework/Recording/StreamRecorder.h - Source/CommonFramework/ResourceDownload/DownloadThread.cpp - Source/CommonFramework/ResourceDownload/DownloadThread.h - Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp - Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h - Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.cpp - Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.h - Source/CommonFramework/ResourceDownload/ResourceDownload.cpp - Source/CommonFramework/ResourceDownload/ResourceDownload.h - Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp - Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.h - Source/CommonFramework/ResourceDownload/ResourceDownloadHelpersQt.cpp - Source/CommonFramework/ResourceDownload/ResourceDownloadHelpersQt.h - Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp - Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.h - Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.cpp - Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.h - Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp - Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.h Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.h Source/CommonFramework/Startup/NewVersionCheck.cpp @@ -685,18 +709,8 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Tools/ErrorDumper.h Source/CommonFramework/Tools/FileDownloader.cpp Source/CommonFramework/Tools/FileDownloader.h - Source/CommonFramework/Tools/FileHash.cpp - Source/CommonFramework/Tools/FileHash.h - Source/CommonFramework/Tools/FileUnzip.cpp - Source/CommonFramework/Tools/FileUnzip.h - Source/CommonFramework/Tools/ProgramEnvironment.cpp - Source/CommonFramework/Tools/ProgramEnvironment.h - Source/CommonFramework/Tools/StatAccumulator.cpp - Source/CommonFramework/Tools/StatAccumulator.h Source/CommonFramework/Tools/VideoStream.cpp Source/CommonFramework/Tools/VideoStream.h - Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp - Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.h Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp @@ -715,7 +729,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/VideoPipeline/Backends/SnapshotManager.h Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.h - Source/CommonFramework/VideoPipeline/CameraInfo.h Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.cpp Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.h Source/CommonFramework/VideoPipeline/Stats/MemoryUtilizationStats.cpp @@ -730,9 +743,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.h - Source/CommonFramework/VideoPipeline/VideoFeed.h - Source/CommonFramework/VideoPipeline/VideoFormats.cpp - Source/CommonFramework/VideoPipeline/VideoFormats.h Source/CommonFramework/VideoPipeline/VideoOverlay.cpp Source/CommonFramework/VideoPipeline/VideoOverlay.h Source/CommonFramework/VideoPipeline/VideoOverlayOption.cpp @@ -742,23 +752,10 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/VideoPipeline/VideoOverlaySession.h Source/CommonFramework/VideoPipeline/VideoOverlayTypes.cpp Source/CommonFramework/VideoPipeline/VideoOverlayTypes.h - Source/CommonFramework/VideoPipeline/VideoPipelineOptions.h - Source/CommonFramework/VideoPipeline/VideoSession.cpp - Source/CommonFramework/VideoPipeline/VideoSession.h - Source/CommonFramework/VideoPipeline/VideoSource.cpp - Source/CommonFramework/VideoPipeline/VideoSource.h - Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp - Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.h - Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Camera.cpp - Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Camera.h - Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Null.cpp - Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Null.h Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.cpp Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.h Source/CommonFramework/Windows/ButtonDiagram.cpp Source/CommonFramework/Windows/ButtonDiagram.h - Source/CommonFramework/Windows/DpiScaler.cpp - Source/CommonFramework/Windows/DpiScaler.h Source/CommonFramework/Windows/MainWindow.cpp Source/CommonFramework/Windows/MainWindow.h Source/CommonFramework/Windows/WindowTracker.cpp @@ -913,8 +910,6 @@ file(GLOB LIBRARY_SOURCES Source/ControllerInput/Keyboard/KeyboardInput_StateTracker.h Source/Controllers/ControllerSelectorWidget.cpp Source/Controllers/ControllerSelectorWidget.h - Source/Controllers/ControllerSession.cpp - Source/Controllers/ControllerSession.h Source/Controllers/ControllerStateTable.cpp Source/Controllers/ControllerStateTable.h Source/Controllers/NullControllerWidget.cpp @@ -924,20 +919,8 @@ file(GLOB LIBRARY_SOURCES Source/Controllers/PABotBase2/SerialPABotBase_StatusThread.h Source/Controllers/SerialPort/SerialPortPollerQt.cpp Source/Controllers/SerialPort/SerialPortPollerQt.h - Source/Controllers/StandardHid/StandardHid_Keyboard.cpp - Source/Controllers/StandardHid/StandardHid_Keyboard.h - Source/Integrations/DiscordIntegrationSettings.cpp - Source/Integrations/DiscordIntegrationSettings.h - Source/Integrations/DiscordIntegrationTable.cpp - Source/Integrations/DiscordIntegrationTable.h - Source/Integrations/DiscordSettingsOption.cpp - Source/Integrations/DiscordSettingsOption.h Source/Integrations/DiscordSocial/DiscordSocial.cpp Source/Integrations/DiscordSocial/DiscordSocial.h - Source/Integrations/DiscordWebhook.cpp - Source/Integrations/DiscordWebhook.h - Source/Integrations/DiscordWebhookSettings.cpp - Source/Integrations/DiscordWebhookSettings.h Source/Integrations/DppIntegration/DppClient.cpp Source/Integrations/DppIntegration/DppClient.h Source/Integrations/DppIntegration/DppCommandHandler.cpp @@ -946,12 +929,6 @@ file(GLOB LIBRARY_SOURCES Source/Integrations/DppIntegration/DppUtility.h Source/Integrations/IntegrationsAPI.cpp Source/Integrations/IntegrationsAPI.h - Source/Integrations/ProgramTracker.cpp - Source/Integrations/ProgramTracker.h - Source/Integrations/PybindSwitchController.cpp - Source/Integrations/PybindSwitchController.h - Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp - Source/Kernels/AbsFFT/Kernels_AbsFFT.h Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch.h Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_Default.h Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX2.h @@ -973,8 +950,6 @@ file(GLOB LIBRARY_SOURCES Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.tpp Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.cpp Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.h - Source/Kernels/AudioStreamConversion/AudioStreamConversion.cpp - Source/Kernels/AudioStreamConversion/AudioStreamConversion.h Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_Default.cpp Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_x86_SSE41.cpp Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.cpp @@ -1179,8 +1154,6 @@ file(GLOB LIBRARY_SOURCES Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.cpp Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.h - Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp - Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.h Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.cpp Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.h Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ControllerState.h @@ -1258,10 +1231,6 @@ file(GLOB LIBRARY_SOURCES Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h Source/NintendoSwitch/NintendoSwitch_Panels.cpp Source/NintendoSwitch/NintendoSwitch_Panels.h - Source/NintendoSwitch/NintendoSwitch_Settings.cpp - Source/NintendoSwitch/NintendoSwitch_Settings.h - Source/NintendoSwitch/NintendoSwitch_SettingsPanel.cpp - Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.cpp From 97b66040956426e99b412a64e3332e76e6b6bd26 Mon Sep 17 00:00:00 2001 From: jw098 Date: Sun, 30 Aug 2026 00:21:15 -0700 Subject: [PATCH 05/11] fix build --- Common/ControllerStates/StandardHid_Keyboard_State.c | 2 +- SerialPrograms/CMakeLists.txt | 8 ++++++++ .../Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Common/ControllerStates/StandardHid_Keyboard_State.c b/Common/ControllerStates/StandardHid_Keyboard_State.c index 813e7d7c2b..a61b724242 100644 --- a/Common/ControllerStates/StandardHid_Keyboard_State.c +++ b/Common/ControllerStates/StandardHid_Keyboard_State.c @@ -8,7 +8,7 @@ #include "StandardHid_Keyboard_State.h" -const pabb_HID_Keyboard_State pabb_HID_Keyboard_State_NEUTRAL_STATE = {}; +const pabb_HID_Keyboard_State pabb_HID_Keyboard_State_NEUTRAL_STATE = {0}; bool pabb_HID_Keyboard_State_equals( const pabb_HID_Keyboard_State* state0, diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt index 73220503ee..1a10d78dca 100644 --- a/SerialPrograms/CMakeLists.txt +++ b/SerialPrograms/CMakeLists.txt @@ -522,6 +522,14 @@ else() # macOS and Linux ${REPO_ROOT_DIR}/3rdParty/sdbus-cpp/lib/libsdbus-c++.a systemd #sdbus-c++ relies on libsystemd, almost all distros should have this ) + + target_include_directories(CoreLib PRIVATE + ${REPO_ROOT_DIR}/3rdParty/sdbus-cpp/include + ) + target_link_libraries(CoreLib PRIVATE + ${REPO_ROOT_DIR}/3rdParty/sdbus-cpp/lib/libsdbus-c++.a + systemd #sdbus-c++ relies on libsystemd, almost all distros should have this + ) endif() # end Linux # Find OpenCV diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp index 6b2c9a6669..6a4793aa86 100644 --- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp +++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp @@ -75,6 +75,9 @@ ImageRGB32 ImageViewRGB32::scale_to(size_t width, size_t height) const{ #ifdef PA_IMAGE_BACKEND_OpenCV return OpenCV_scale_image(*this, width, height); #endif +#ifdef PA_IMAGE_BACKEND_None + return ImageRGB32(); +#endif } From c2b915492aad34abc517aa5abd812c81d01d67ff Mon Sep 17 00:00:00 2001 From: jw098 Date: Sun, 30 Aug 2026 00:46:49 -0700 Subject: [PATCH 06/11] fix build --- SerialPrograms/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt index 1a10d78dca..2f10eb14cc 100644 --- a/SerialPrograms/CMakeLists.txt +++ b/SerialPrograms/CMakeLists.txt @@ -591,9 +591,13 @@ else() # macOS and Linux target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshorten-64-to-32) # on macOS, need this framework to query OS API to control display sleep and system sleep behavior target_link_libraries(SerialProgramsLib PRIVATE "-framework IOKit -framework CoreFoundation") + + target_compile_options(CoreLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshorten-64-to-32) + target_link_libraries(CoreLib PRIVATE "-framework IOKit -framework CoreFoundation") else() # Linux # Assume GCC target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -fno-strict-aliasing) + target_compile_options(CoreLib PRIVATE -Wall -Wextra -Wpedantic -Werror -fno-strict-aliasing) endif() if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") From 5396a862c5cfab3cd72d21dec1751d006ed3a0d7 Mon Sep 17 00:00:00 2001 From: jw098 Date: Sun, 30 Aug 2026 01:01:55 -0700 Subject: [PATCH 07/11] fix build --- SerialPrograms/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt index 2f10eb14cc..26031d441f 100644 --- a/SerialPrograms/CMakeLists.txt +++ b/SerialPrograms/CMakeLists.txt @@ -376,6 +376,10 @@ if (WIN32) target_compile_options(SerialProgramsLib PRIVATE /wd5054) # Deprecated enum arithemtic target_compile_options(SerialProgramsLib PRIVATE /wd4505) # unreferenced local function has been removed + target_compile_options(CoreLib PRIVATE /FAs /FaAssembly/ /MP /W4 /WX /external:anglebrackets /external:W0 /utf-8) + target_compile_options(CoreLib PRIVATE /wd5054) # Deprecated enum arithemtic + target_compile_options(CoreLib PRIVATE /wd4505) # unreferenced local function has been removed + set(ARCH_FLAGS_09_Nehalem /W4) # Dummy parameter set(ARCH_FLAGS_13_Haswell /arch:AVX2) set(ARCH_FLAGS_17_Skylake /arch:AVX512) @@ -384,6 +388,8 @@ if (WIN32) if(CMAKE_GENERATOR_TOOLSET MATCHES "ClangCL") target_compile_options(SerialProgramsLib PRIVATE -Wno-unused-function) target_compile_options(SerialProgramsLib PRIVATE -march=nehalem) + target_compile_options(CoreLib PRIVATE -Wno-unused-function) + target_compile_options(CoreLib PRIVATE -march=nehalem) set(ARCH_FLAGS_09_Nehalem -march=nehalem) set(ARCH_FLAGS_13_Haswell -march=haswell) set(ARCH_FLAGS_17_Skylake -march=skylake-avx512) From 9d2b2c16b2b7724a7f7839625506994eb5a12871 Mon Sep 17 00:00:00 2001 From: jw098 Date: Sun, 30 Aug 2026 01:36:09 -0700 Subject: [PATCH 08/11] fix build --- .../Source/CommonFramework/ResourceDownload/DownloadThread.cpp | 2 +- .../ResourceDownload/ResourceDownloadHelpers.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp index 6a54f42b40..8659775b1b 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp @@ -95,7 +95,7 @@ void DownloadThread::run_download(DownloadedResourceMetadata resource_metadata){ std::string url = resource_metadata.url; std::string resource_name = resource_metadata.resource_name; - uint64_t expected_size = resource_metadata.size_compressed_bytes; + [[maybe_unused]] uint64_t expected_size = resource_metadata.size_compressed_bytes; std::string resource_directory = DOWNLOADED_RESOURCE_PATH() + resource_name; try{ diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp index 588f4d0cee..0e2bf9ad47 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp @@ -170,8 +170,8 @@ const std::unordered_set& all_resource_names(){ JsonValue fetch_resource_download_list_json_from_remote(){ - Logger& logger = global_logger_tagged(); #ifdef QT_CORE_LIB + Logger& logger = global_logger_tagged(); JsonValue json = FileDownloader::download_json_file( logger, From 25ac509ae8877d3bc76956065e159ca4a8030a92 Mon Sep 17 00:00:00 2001 From: jw098 Date: Sun, 30 Aug 2026 02:10:26 -0700 Subject: [PATCH 09/11] fix build --- .../PABotBase2CC_ReliableStreamConnection.cpp | 4 ++-- SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp | 4 ++-- .../Controllers/PABotBase2/PABotBase2_DeviceHandle.cpp | 4 ++-- .../StandardHid/StandardHid_Keyboard_PABotBase2.cpp | 2 +- .../PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp | 6 +++--- .../NintendoSwitch_PABotBase2_WiredController.cpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.cpp b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.cpp index 3b431f4395..c7695851b1 100644 --- a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.cpp +++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.cpp @@ -524,7 +524,7 @@ void ReliableStreamConnection::process_RET_BUFFER_SLOTS(const PacketHeader* pack { std::lock_guard lg(m_lock); m_reliable_sender.remove(packet->seqnum); - m_max_unacked_packets = std::min(message->data, PABB2_PacketSender_REORDER_WINDOW); + m_max_unacked_packets = std::min((uint8_t)message->data, PABB2_PacketSender_REORDER_WINDOW); } m_logger.log( "[RSC]: Setting Reorder Window: " + std::to_string(m_max_unacked_packets) + " slots", @@ -544,7 +544,7 @@ void ReliableStreamConnection::process_RET_BUFFER_BYTES(const PacketHeader* pack { std::lock_guard lg(m_lock); m_reliable_sender.remove(packet->seqnum); - m_max_unacked_bytes = std::min(message->data, PABB2_PacketSender_BUFFER_SIZE); + m_max_unacked_bytes = std::min((uint16_t)message->data, PABB2_PacketSender_BUFFER_SIZE); } m_logger.log( "[RSC]: Setting Reorder Window: " + std::to_string(m_max_unacked_bytes) + " bytes", diff --git a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp index 7be6d3ee7a..43eeb18bd5 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp +++ b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp @@ -26,7 +26,7 @@ int scale_dpi_width(int width){ } return width * dpi / 96; #else - return 0; + return 0*width; #endif } int scale_dpi_height(int height){ @@ -38,7 +38,7 @@ int scale_dpi_height(int height){ } return height * dpi / 96; #else - return 0; + return 0*height; #endif } diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.cpp b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.cpp index c8d96761c3..daa5ac1bc2 100644 --- a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.cpp +++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.cpp @@ -145,7 +145,7 @@ void DeviceHandle::query_protocol(){ { m_device_id = query_u32(PABB2_MESSAGE_OPCODE_DEVICE_IDENTIFIER); m_logger.log("[MLC]: Device ID: 0x" + tostr_hex(m_device_id), COLOR_BLUE); - auto iter = PROGRAMS->find(m_device_id); + auto iter = PROGRAMS->find((uint8_t)m_device_id); if (iter == PROGRAMS->end()){ m_logger.Logger::log( "Unrecognized Program ID: (0x" + tostr_hex(m_device_id) + ") for this protocol version. " @@ -207,7 +207,7 @@ void DeviceHandle::query_command_queue(){ // Don't let it get too large since we don't need it. command_queue_size = std::min( - command_queue_size, + (uint8_t)command_queue_size, ControllerSettings::instance().COMMAND_QUEUE_LIMIT ); diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.cpp b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.cpp index c57517b609..10f04ee0b4 100644 --- a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.cpp +++ b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.cpp @@ -251,7 +251,7 @@ void PABotBase2_Keyboard::execute_state( while (time_left > Milliseconds::zero()){ Milliseconds current = std::min(time_left, 65535ms); - request.milliseconds = current.count(); + request.milliseconds = (uint16_t)current.count(); m_connection.device().command_queue().send_command(cancellable, request); time_left -= current; } diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp index 4a5eee0e91..379c42870c 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp @@ -472,7 +472,7 @@ void PABotBase2_OemController::issue_report( while (time_left > Milliseconds::zero()){ Milliseconds current = std::min(time_left, 65535ms); - request.milliseconds = current.count(); + request.milliseconds = (uint16_t)current.count(); m_connection.device().command_queue().send_command(cancellable, request); time_left -= current; } @@ -536,7 +536,7 @@ void PABotBase2_OemController::issue_report( while (time_left > Milliseconds::zero()){ Milliseconds current = std::min(time_left, 65535ms); - request.milliseconds = current.count(); + request.milliseconds = (uint16_t)current.count(); m_connection.device().command_queue().send_command(cancellable, request); time_left -= current; } @@ -743,7 +743,7 @@ PABotBase2_OemController::RumbleData PABotBase2_OemController::parse_rumble(cons return RumbleData{ rumble_index_to_freq(lo_freq_i), - rumble_index_to_amp(lo_amp_i), + rumble_index_to_amp((uint8_t)lo_amp_i), rumble_index_to_freq(hi_freq_i * 0.25 + 32), rumble_index_to_amp(hi_amp_i) }; diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.cpp index 81a7c202cc..37add1e652 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.cpp @@ -213,7 +213,7 @@ void PABotBase2_WiredController::execute_state( while (time_left > Milliseconds::zero()){ Milliseconds current = std::min(time_left, 65535ms); - request.milliseconds = current.count(); + request.milliseconds = (uint16_t)current.count(); m_connection.device().command_queue().send_command(cancellable, request); time_left -= current; } From 7837c73914ee6bab678d587b1e0cc65328103170 Mon Sep 17 00:00:00 2001 From: jw098 Date: Sun, 30 Aug 2026 14:00:22 -0700 Subject: [PATCH 10/11] break the Qt dependencies higher up --- .../AudioPipeline/AudioInfo.cpp | 10 +- .../CommonFramework/AudioPipeline/AudioInfo.h | 10 +- .../AudioPipeline/AudioPassthroughPair.h | 24 +- .../AudioPipeline/AudioSession.cpp | 6 - .../ErrorReports/ErrorReports.cpp | 10 - .../Notifications/MessageAttachment.cpp | 11 +- .../Notifications/ProgramNotifications.cpp | 2 +- .../Environment/ThemeSelectorOption.cpp | 4 - .../CommonFramework/Panels/PanelInstance.h | 4 - .../CommonFramework/Panels/SettingsPanel.h | 2 - .../Source/CommonFramework/ProgramSession.cpp | 5 - .../ProgramStats/StatsDatabase.cpp | 8 - .../Recording/StreamHistorySession.cpp | 5 - .../Recording/StreamHistorySession.h | 3 +- .../Recording/StreamHistoryTracker_Null.h | 4 - .../ResourceDownload/DownloadThread.cpp | 4 +- .../ResourceDownloadHelpers.cpp | 2 - .../Backends/CameraImplementations.cpp | 10 +- .../VideoPipeline/VideoSession.cpp | 5 +- .../VideoPipeline/VideoSession.h | 2 - .../VideoPipeline/VideoSourceDescriptor.cpp | 6 - .../CommonFramework/Windows/DpiScaler.cpp | 14 +- .../CommonFramework/Windows/DpiScaler.h | 5 +- .../CommonFramework/Windows/MainWindow.cpp | 1 - .../Source/Controllers/ControllerState.cpp | 15 +- .../DiscordIntegrationSettings.cpp | 7 - .../Integrations/DiscordIntegrationSettings.h | 1 + .../Integrations/DiscordSettingsOption.cpp | 1 + .../Source/Integrations/DiscordWebhook.cpp | 12 +- .../Source/Integrations/DiscordWebhook.h | 6 +- ...intendoSwitch_PABotBase2_OemController.cpp | 6 +- .../NintendoSwitch_Settings.cpp | 2 + .../NintendoSwitch/NintendoSwitch_Settings.h | 4 + SerialPrograms/cmake/SourceFiles.cmake | 522 +++++++++--------- 34 files changed, 323 insertions(+), 410 deletions(-) diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp index ac5d3a7d9f..71bc015170 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp @@ -5,9 +5,7 @@ */ #include -#ifdef QT_CORE_LIB #include -#endif #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/Time.h" #include "Common/Cpp/PrettyPrint.h" @@ -21,7 +19,7 @@ //using std::cout; //using std::endl; -#ifdef QT_CORE_LIB + #if QT_VERSION_MAJOR == 5 #include #elif QT_VERSION_MAJOR == 6 @@ -30,7 +28,6 @@ #else #error "Unsupported Qt version." #endif -#endif #if QT_VERSION_MAJOR != 5 @@ -52,7 +49,6 @@ const char* AUDIO_FORMAT_LABELS[] = { "1 x 96,000 Hz (Interleaved Stereo R/L)", }; -#ifdef QT_CORE_LIB void set_format(QAudioFormat& native_format, AudioChannelFormat format){ switch (format){ case AudioChannelFormat::MONO_48000: @@ -305,7 +301,7 @@ std::vector supported_output_formats(int& preferred_index, c return ret; } -#endif + @@ -528,7 +524,6 @@ const std::vector& AudioDeviceInfo::supported_formats() cons int AudioDeviceInfo::preferred_format_index() const{ return m_body->preferred_format_index; } -#ifdef QT_CORE_LIB QAudioFormat AudioDeviceInfo::preferred_format() const{ QAudioFormat format = native_info().preferredFormat(); int index = preferred_format_index(); @@ -540,7 +535,6 @@ QAudioFormat AudioDeviceInfo::preferred_format() const{ const NativeAudioInfo& AudioDeviceInfo::native_info() const{ return m_body->info; } -#endif bool AudioDeviceInfo::operator==(const AudioDeviceInfo& info) const{ return device_name() == info.device_name(); } diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h index 265e6db9b9..3a15adff71 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h @@ -9,10 +9,9 @@ #include #include +#include #include "Common/Cpp/Containers/Pimpl.h" -#ifdef QT_CORE_LIB -#include class QAudioFormat; #if QT_VERSION_MAJOR == 5 @@ -24,7 +23,6 @@ using NativeAudioInfo = QAudioDevice; #else #error "Unknown Qt version." #endif -#endif @@ -53,12 +51,11 @@ enum class AudioChannelFormat{ }; extern const char* AUDIO_FORMAT_LABELS[]; -#ifdef QT_CORE_LIB // Set the QAudioFormat to the our audio format enum. void set_format(QAudioFormat& native_format, AudioChannelFormat format); + AudioSampleFormat get_sample_format(QAudioFormat& native_format); -#endif @@ -80,12 +77,9 @@ class AudioDeviceInfo{ const std::vector& supported_formats() const; int preferred_format_index() const; - #ifdef QT_CORE_LIB QAudioFormat preferred_format() const; const NativeAudioInfo& native_info() const; - #endif - bool operator==(const AudioDeviceInfo& info) const; diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h index 69f0714cd8..c0b4a2bd99 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h @@ -25,11 +25,11 @@ struct FFTListener; // class AudioPassthroughPair{ public: - virtual void add_listener(AudioFloatStreamListener& listener) {} - virtual void remove_listener(AudioFloatStreamListener& listener) {} + virtual void add_listener(AudioFloatStreamListener& listener) = 0; + virtual void remove_listener(AudioFloatStreamListener& listener) = 0; - virtual void add_listener(FFTListener& listener) {} - virtual void remove_listener(FFTListener& listener) {} + virtual void add_listener(FFTListener& listener) = 0; + virtual void remove_listener(FFTListener& listener) = 0; public: virtual ~AudioPassthroughPair() = default; @@ -37,20 +37,20 @@ class AudioPassthroughPair{ virtual void reset( const std::string& file, const AudioDeviceInfo& output, double output_volume - ) {} + ) = 0; virtual void reset( const AudioDeviceInfo& input, AudioChannelFormat format, const AudioDeviceInfo& output, double output_volume - ) {} + ) = 0; - virtual void clear_audio_source() {} - virtual void set_audio_source(const std::string& file) {} - virtual void set_audio_source(const AudioDeviceInfo& device, AudioChannelFormat format) {} + virtual void clear_audio_source() = 0; + virtual void set_audio_source(const std::string& file) = 0; + virtual void set_audio_source(const AudioDeviceInfo& device, AudioChannelFormat format) = 0; - virtual void clear_audio_sink() {} - virtual void set_audio_sink(const AudioDeviceInfo& device, double volume) {} + virtual void clear_audio_sink() = 0; + virtual void set_audio_sink(const AudioDeviceInfo& device, double volume) = 0; - virtual void set_sink_volume(double volume) {} // Volume Range: [0, 1.0] + virtual void set_sink_volume(double volume) = 0; // Volume Range: [0, 1.0] }; diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.cpp index 6a26866e7b..5483a94c9d 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.cpp @@ -7,9 +7,7 @@ #include "Common/Cpp/Logging/AbstractLogger.h" #include "CommonFramework/GlobalServices.h" #include "CommonFramework/GlobalSettingsPanel.h" -#ifdef QT_CORE_LIB #include "Backends/AudioPassthroughPairQtThread.h" -#endif #include "AudioPipelineOptions.h" #include "AudioSession.h" @@ -48,11 +46,7 @@ void AudioSession::remove_spectrum_listener(AudioSpectrumHolder::Listener& liste AudioSession::AudioSession(Logger& logger, AudioOption& option) : m_logger(logger) , m_option(option) - #ifdef QT_CORE_LIB , m_devices(new AudioPassthroughPairQtThread(logger)) - #else - , m_devices(new AudioPassthroughPair()) - #endif { AudioSession::reset(); m_devices->add_listener(*this); diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp index f27bcf379c..e988e39c86 100644 --- a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp +++ b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp @@ -5,10 +5,8 @@ */ #include -#ifdef QT_CORE_LIB #include #include -#endif #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Logging/GlobalLogger.h" #include "Common/Cpp/Logging/LastLogTracker.h" @@ -115,9 +113,7 @@ SendableErrorReport::SendableErrorReport() , m_program_runtime_millis(0) , m_dump_name(ERROR_DUMP_NAME) { -#ifdef QT_CORE_LIB QDir().mkpath(QString::fromStdString(m_directory)); -#endif } SendableErrorReport::SendableErrorReport( Logger* logger, @@ -147,7 +143,6 @@ SendableErrorReport::SendableErrorReport( log += line.text; log += "\r\n"; } - #ifdef QT_CORE_LIB QFile file(QString::fromStdString(m_directory + ERROR_LOGS_NAME)); bool exists = file.exists(); if (file.open(QIODevice::WriteOnly)){ @@ -158,7 +153,6 @@ SendableErrorReport::SendableErrorReport( file.write(log.c_str()); file.flush(); } - #endif m_logs_name = ERROR_LOGS_NAME; } if (stream_history){ @@ -299,7 +293,6 @@ void SendableErrorReport::save_report_json(Logger* logger) const{ void SendableErrorReport::move_to_sent(){ // cout << "move_to_sent()" << endl; -#ifdef QT_CORE_LIB QDir().mkdir(QString::fromStdString(ERROR_PATH_SENT)); std::string new_directory = ERROR_PATH_SENT + "/" + m_timestamp + "/"; @@ -315,13 +308,11 @@ void SendableErrorReport::move_to_sent(){ global_logger_tagged().log("Unable to move error report " + m_timestamp + ".", COLOR_RED); } m_directory = std::move(new_directory); -#endif } std::vector SendableErrorReport::get_pending_reports(){ std::vector ret; -#ifdef QT_CORE_LIB QDir dir(QString::fromStdString(ERROR_PATH_UNSENT)); dir.setFilter(QDir::Filter::AllDirs); QFileInfoList list = dir.entryInfoList(); @@ -332,7 +323,6 @@ std::vector SendableErrorReport::get_pending_reports(){ } ret.emplace_back(std::move(path)); } -#endif return ret; } diff --git a/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.cpp b/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.cpp index b0da257bab..341d7bd70c 100644 --- a/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.cpp +++ b/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.cpp @@ -4,10 +4,8 @@ * */ -#ifdef QT_CORE_LIB #include #include -#endif #include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/GlobalSettingsPanel.h" @@ -40,22 +38,17 @@ PendingFileSend::~PendingFileSend(){ if (m_extend_lifetime.load(std::memory_order_acquire)){ return; } -#ifdef QT_CORE_LIB + QFile file(QString::fromStdString(m_filepath)); file.remove(); -#endif } PendingFileSend::PendingFileSend(const std::string& file, bool keep_file) : m_keep_file(keep_file) , m_extend_lifetime(false) , m_filepath(file) { - #ifdef QT_CORE_LIB QFileInfo info(QString::fromStdString(file)); m_filename = info.fileName().toStdString(); - #else - m_filename = ""; - #endif } PendingFileSend::PendingFileSend(Logger& logger, const ImageAttachment& image) : m_keep_file(image.keep_file) @@ -87,9 +80,7 @@ PendingFileSend::PendingFileSend(Logger& logger, const ImageAttachment& image) m_filepath = SCREENSHOTS_PATH() + m_filename; }else{ m_filepath = GlobalSettings::instance().TEMP_FOLDER; - #ifdef QT_CORE_LIB QDir().mkdir(QString::fromStdString(m_filepath)); - #endif m_filepath += m_filename; } diff --git a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp index 67c4ed76c8..c1092c6cb2 100644 --- a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp +++ b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp @@ -4,7 +4,7 @@ * */ -// #include +#include #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp index 3f8c38a3c6..b927e27fe6 100644 --- a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp +++ b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp @@ -4,11 +4,9 @@ * */ -#ifdef QT_CORE_LIB #include #include #include -#endif #include "Common/Cpp/Exceptions.h" #include "CommonFramework/Windows/DpiScaler.h" #include "ThemeSelectorOption.h" @@ -18,7 +16,6 @@ namespace PokemonAutomation{ void set_theme(UiThemeMode theme_mode){ -#ifdef QT_CORE_LIB if (theme_mode == CURRENT_THEME){ return; } @@ -44,7 +41,6 @@ void set_theme(UiThemeMode theme_mode){ app->setStyleSheet(stylesheet); CURRENT_THEME = theme_mode; -#endif } diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h b/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h index e4909d9f8d..f224633189 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h +++ b/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h @@ -10,9 +10,7 @@ #include "Common/Compiler.h" #include "PanelDescriptor.h" -#ifdef QT_CORE_LIB class QWidget; -#endif namespace PokemonAutomation{ @@ -34,12 +32,10 @@ class PanelInstance{ void validate_resource_list(); -#ifdef QT_CORE_LIB public: // The implmentation is defined in "UI/PanelWidget.h" to avoid circular dependency // Returns a UI/PanelWidget.h:PanelWidget virtual QWidget* make_widget(QWidget& parent, PanelHolder& holder); -#endif public: // Serialization diff --git a/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.h b/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.h index f6e3be7909..5f8b754ead 100644 --- a/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.h +++ b/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.h @@ -23,9 +23,7 @@ class SettingsPanelInstance : public PanelInstance{ m_options.add_option(option, std::move(serialization_string)); } -#ifdef QT_CORE_LIB virtual QWidget* make_widget(QWidget& parent, PanelHolder& holder) override; -#endif public: // Serialization diff --git a/SerialPrograms/Source/CommonFramework/ProgramSession.cpp b/SerialPrograms/Source/CommonFramework/ProgramSession.cpp index 0e1e84c597..256273edcb 100644 --- a/SerialPrograms/Source/CommonFramework/ProgramSession.cpp +++ b/SerialPrograms/Source/CommonFramework/ProgramSession.cpp @@ -297,13 +297,8 @@ RequiredResourceResult ProgramSession::find_missing_resources(){ continue; case ResourceVersionStatus::OUTDATED: case ResourceVersionStatus::NOT_APPLICABLE:{ - // we don't have the resource. check remote to see if correct version is available. - #ifdef QT_CORE_LIB DownloadedResourceMetadata remote_resource = get_remote_resource_metadata_from_resource_slug(resource_type); - #else - DownloadedResourceMetadata remote_resource = DownloadedResourceMetadata{}; // placeholder when no Qt - #endif DownloadedResourceMetadata expected_resource = get_expected_resource_metadata_from_resource_slug(resource_type); uint16_t expected_version_num = expected_resource.version_num.value(); uint16_t remote_version_num = remote_resource.version_num.value(); diff --git a/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp index 8ed0dea50b..aa7125bf00 100644 --- a/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp +++ b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp @@ -4,10 +4,8 @@ * */ -#ifdef QT_CORE_LIB #include #include -#endif #include "Common/Cpp/Time.h" #include "StatsDatabase.h" @@ -137,16 +135,13 @@ std::string StatSet::to_str() const{ } void StatSet::save_to_file(const std::string& filepath){ - #ifdef QT_CORE_LIB QFile file(QString::fromStdString(filepath)); if (file.open(QIODevice::WriteOnly)){ std::string data = to_str(); file.write(data.c_str(), data.size()); } - #endif } void StatSet::open_from_file(const std::string& filepath){ - #ifdef QT_CORE_LIB QFile file(QString::fromStdString(filepath)); if (!file.open(QIODevice::ReadOnly)){ return; @@ -154,7 +149,6 @@ void StatSet::open_from_file(const std::string& filepath){ std::string str = file.readAll().data(); load_from_string(str.c_str()); - #endif } bool StatSet::update_file( @@ -162,7 +156,6 @@ bool StatSet::update_file( const std::string& identifier, StatsTracker& tracker ){ - #ifdef QT_CORE_LIB QFile file(QString::fromStdString(filepath)); while (!file.open(QIODevice::ReadWrite)){ return false; @@ -178,7 +171,6 @@ bool StatSet::update_file( file.seek(0); file.write(data.c_str(), data.size()); file.resize(data.size()); - #endif return true; } diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp index fd4ef1bd22..a692d6f7c6 100644 --- a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp +++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp @@ -8,9 +8,7 @@ #include "Common/Cpp/Containers/Pimpl.tpp" #include "Common/Cpp/Concurrency/SpinLock.h" #include "CommonFramework/GlobalSettingsPanel.h" -#ifdef QT_CORE_LIB #include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h" -#endif #include "CommonFramework/Recording/StreamHistoryOption.h" #if (QT_VERSION_MAJOR == 6) && (QT_VERSION_MINOR >= 8) @@ -100,8 +98,6 @@ void StreamHistorySession::on_samples(const float* samples, size_t frames){ data.m_current->on_samples(samples, frames); } } - -#ifdef QT_CORE_LIB void StreamHistorySession::on_frame(std::shared_ptr frame){ Data& data = *m_data; WriteSpinLock lg(data.m_lock); @@ -109,7 +105,6 @@ void StreamHistorySession::on_frame(std::shared_ptr frame){ data.m_current->on_frame(std::move(frame)); } } -#endif void StreamHistorySession::clear(){ diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.h b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.h index 723bb1f2cb..f6379d414c 100644 --- a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.h +++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.h @@ -31,9 +31,8 @@ class StreamHistorySession public: virtual void on_samples(const float* data, size_t frames) override; -#ifdef QT_CORE_LIB virtual void on_frame(std::shared_ptr frame) override; -#endif + public: virtual void pre_input_change() override; virtual void post_input_change(const std::string& file, const AudioDeviceInfo& device, AudioChannelFormat format) override; diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_Null.h b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_Null.h index dc4e9c99ba..3febaba31f 100644 --- a/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_Null.h +++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_Null.h @@ -11,9 +11,7 @@ #include "Common/Compiler.h" #include "Common/Cpp/Logging/AbstractLogger.h" -#ifdef QT_CORE_LIB #include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h" -#endif namespace PokemonAutomation{ @@ -38,9 +36,7 @@ class StreamHistoryTracker{ public: void on_samples(const float* data, size_t frames){} - #ifdef QT_CORE_LIB void on_frame(std::shared_ptr frame){} - #endif private: Logger& m_logger; diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp index 8659775b1b..0e149ad8f2 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp @@ -95,7 +95,7 @@ void DownloadThread::run_download(DownloadedResourceMetadata resource_metadata){ std::string url = resource_metadata.url; std::string resource_name = resource_metadata.resource_name; - [[maybe_unused]] uint64_t expected_size = resource_metadata.size_compressed_bytes; + uint64_t expected_size = resource_metadata.size_compressed_bytes; std::string resource_directory = DOWNLOADED_RESOURCE_PATH() + resource_name; try{ @@ -105,7 +105,6 @@ void DownloadThread::run_download(DownloadedResourceMetadata resource_metadata){ // download std::string zip_path = resource_directory + "/temp.zip"; - #ifdef QT_CORE_LIB FileDownloader::download_file_to_disk( *this, logger, @@ -116,7 +115,6 @@ void DownloadThread::run_download(DownloadedResourceMetadata resource_metadata){ m_hooks.report_download_progress(bytes_done, total_bytes); } ); - #endif // hash std::string hash = diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp index 0e2bf9ad47..a0374bf6d5 100644 --- a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp +++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp @@ -4,9 +4,7 @@ * */ -#ifdef QT_CORE_LIB #include "CommonFramework/Tools/FileDownloader.h" -#endif #include "Common/Cpp/Filesystem/Filesystem.h" #include "Common/Cpp/Json/JsonArray.h" #include "Common/Cpp/Json/JsonObject.h" diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp index 25eb994b90..c820520a67 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp @@ -3,9 +3,8 @@ * From: https://github.com/PokemonAutomation/ * */ -#ifdef QT_CORE_LIB + #include -#endif //#include "Common/Cpp/PrettyPrint.h" #include "CommonFramework/StaticGlobals.h" #include "CommonFramework/Globals.h" @@ -17,11 +16,10 @@ //using std::cout; //using std::endl; -#ifdef QT_CORE_LIB #include "CameraWidgetQt6.h" #include "CameraWidgetQt6.5.h" #include "CameraWidgetQt6_QQuickWidget.h" -#endif + namespace PokemonAutomation{ @@ -50,9 +48,8 @@ struct CameraBackends{ } CameraBackends(){ - #ifdef QT_CORE_LIB m_backends.emplace_back( - "qt6-QVideoSink", "Qt6: QVideoSink", + "qt6-QVideoSink", "Qt6: QVideoSink", std::make_unique() ); m_backends.emplace_back( @@ -65,7 +62,6 @@ struct CameraBackends{ std::make_unique() ); } - #endif size_t items = 0; for (const auto& item : m_backends){ diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp index 31c86830e4..9cda195871 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp @@ -8,9 +8,7 @@ #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/GlobalServices.h" #include "CommonFramework/VideoPipeline/VideoPipelineOptions.h" -#ifdef QT_CORE_LIB #include "Backends/VideoFrameQt.h" -#endif #include "VideoSources/VideoSource_Null.h" #include "VideoSession.h" @@ -487,7 +485,7 @@ void VideoSession::on_watchdog_timeout(){ reset(); } -#ifdef QT_CORE_LIB + void VideoSession::on_frame(std::shared_ptr frame){ m_frame_listeners.run_method(&VideoFrameListener::on_frame, frame); { @@ -496,7 +494,6 @@ void VideoSession::on_frame(std::shared_ptr frame){ } global_watchdog().delay(*this); } -#endif void VideoSession::on_rendered_frame(WallClock timestamp){ WriteSpinLock lg(m_fps_lock, PA_CURRENT_FUNCTION); m_fps_tracker_rendered.push_event(timestamp); diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h index 9d6a1eaf8c..bb255c8102 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h @@ -194,9 +194,7 @@ class VideoSession // This function is thread-safe as it has a lock to prevent concurrent fps calls. // Note the lock does not protect the other frame listeners added by // VideoSession::add_frame_listener(). -#ifdef QT_CORE_LIB virtual void on_frame(std::shared_ptr frame) override; -#endif // Overwrites VideoSource::RenderedFrameListener::on_rendered_frame() // This function is called when the video source finds a new rendered frame so // VideoSession can update its internal fps record. diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp index bfab15496d..357b8ea0f4 100644 --- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp +++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp @@ -11,9 +11,7 @@ #include "VideoSourceDescriptor.h" #include "VideoSources/VideoSource_Null.h" -#ifdef QT_CORE_LIB #include "VideoSources/VideoSource_StillImage.h" -#endif #include "VideoSources/VideoSource_Camera.h" //#include @@ -54,9 +52,7 @@ std::shared_ptr VideoSourceOption::get_descriptor_from_ca descriptor.reset(new VideoSourceDescriptor_Null()); break; case VideoSourceType::StillImage: - #ifdef QT_CORE_LIB descriptor.reset(new VideoSourceDescriptor_StillImage()); - #endif break; case VideoSourceType::Camera: descriptor.reset(new VideoSourceDescriptor_Camera()); @@ -126,11 +122,9 @@ void VideoSourceOption::load_json(const JsonValue& json){ const JsonValue* params; params = obj->get_value(VIDEO_TYPE_STRINGS.get_string(VideoSourceType::StillImage)); if (params != nullptr){ - #ifdef QT_CORE_LIB auto x = std::make_unique(); x->load_json(*params); m_descriptor_cache[VideoSourceType::StillImage] = std::move(x); - #endif } params = obj->get_value(VIDEO_TYPE_STRINGS.get_string(VideoSourceType::VideoPlayback)); if (params != nullptr){ diff --git a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp index 43eeb18bd5..56f64de14a 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp +++ b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp @@ -4,10 +4,8 @@ * */ -#ifdef QT_CORE_LIB #include #include -#endif #include "DpiScaler.h" //#include @@ -18,31 +16,23 @@ namespace PokemonAutomation{ int scale_dpi_width(int width){ -#ifdef QT_CORE_LIB int dpi = 96; QScreen* primaryScreen = QGuiApplication::primaryScreen(); if (primaryScreen != nullptr){ dpi = primaryScreen->logicalDotsPerInchX(); } return width * dpi / 96; -#else - return 0*width; -#endif } int scale_dpi_height(int height){ -#ifdef QT_CORE_LIB int dpi = 96; QScreen* primaryScreen = QGuiApplication::primaryScreen(); if (primaryScreen != nullptr){ dpi = primaryScreen->logicalDotsPerInchY(); } return height * dpi / 96; -#else - return 0*height; -#endif } -#ifdef QT_CORE_LIB + void scale_dpi_token(QString& str, int dpi){ size_t length = str.length(); if (length < 3){ @@ -67,6 +57,7 @@ void scale_dpi_token(QString& str, int dpi){ str = QString::number(value) + "px"; } + QString scale_dpi_stylesheet(const QString& style_str){ QScreen* primaryScreen = QGuiApplication::primaryScreen(); if (primaryScreen == nullptr){ @@ -99,7 +90,6 @@ QString scale_dpi_stylesheet(const QString& style_str){ // cout << "out.length() = " << out.length() << endl; return out; } -#endif } diff --git a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.h b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.h index 5a34eaabce..02e27acb0c 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.h +++ b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.h @@ -7,6 +7,8 @@ #ifndef PokemonAutomation_DpiScaler_H #define PokemonAutomation_DpiScaler_H +#include +#include namespace PokemonAutomation{ @@ -14,9 +16,8 @@ namespace PokemonAutomation{ int scale_dpi_width(int width); int scale_dpi_height(int height); -#ifdef QT_CORE_LIB + QString scale_dpi_stylesheet(const QString& style_str); -#endif diff --git a/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp b/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp index 6e8890ff72..8f587a0540 100644 --- a/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp +++ b/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp @@ -5,7 +5,6 @@ */ #include -#include //#include #include #include diff --git a/SerialPrograms/Source/Controllers/ControllerState.cpp b/SerialPrograms/Source/Controllers/ControllerState.cpp index 61f3706776..105aec2198 100644 --- a/SerialPrograms/Source/Controllers/ControllerState.cpp +++ b/SerialPrograms/Source/Controllers/ControllerState.cpp @@ -5,7 +5,8 @@ */ #include "Common/Cpp/Json/JsonObject.h" -#include "CommonFramework/Exceptions/OperationFailedException.h" +// #include "CommonFramework/Exceptions/OperationFailedException.h" +#include "Common/Cpp/Exceptions.h" #include "ControllerState.h" namespace PokemonAutomation{ @@ -14,14 +15,12 @@ namespace PokemonAutomation{ void ControllerState::load_json(const JsonObject& json){ - throw OperationFailedException( - ErrorReport::NO_ERROR_REPORT, + throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "This controller does not support serialization." ); } JsonObject ControllerState::to_json() const{ - throw OperationFailedException( - ErrorReport::NO_ERROR_REPORT, + throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "This controller does not support serialization." ); } @@ -31,14 +30,12 @@ void ControllerState::execute( AbstractController& controller, Milliseconds duration ) const{ - throw OperationFailedException( - ErrorReport::NO_ERROR_REPORT, + throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "This controller does not support execution." ); } std::string ControllerState::to_cpp(Milliseconds hold, Milliseconds release) const{ - throw OperationFailedException( - ErrorReport::NO_ERROR_REPORT, + throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "This controller does not support cpp conversion." ); } diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp index 2263415a38..ec1fe03cd2 100644 --- a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp +++ b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp @@ -4,11 +4,8 @@ * */ -#include #include "Common/Cpp/Strings/Unicode.h" -#ifdef QT_CORE_LIB #include "Common/Qt/StringToolsQt.h" -#endif #include "Integrations/DppIntegration/DppClient.h" #include "DiscordIntegrationSettings.h" @@ -170,21 +167,17 @@ std::string convert(const std::string& message){ MessageBuilder::MessageBuilder(const std::vector& message_tags){ - #ifdef QT_CORE_LIB for (const std::string& tag : message_tags){ m_message_tags.insert(to_lower(tag)); } - #endif } bool MessageBuilder::should_send(const std::vector& channel_tags) const{ - #ifdef QT_CORE_LIB for (const std::string& tag : channel_tags){ auto iter = m_message_tags.find(to_lower(tag)); if (iter != m_message_tags.end()){ return true; } } - #endif return false; } std::string MessageBuilder::build_message( diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h index 916ab4455e..39591afca0 100644 --- a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h +++ b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h @@ -13,6 +13,7 @@ #include "Common/Cpp/Options/StringOption.h" #include "Common/Cpp/Options/EnumDropdownOption.h" #include "Common/Cpp/Options/ButtonOption.h" +#include "Common/Qt/Options/GroupWidget.h" #include "DiscordIntegrationTable.h" namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp b/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp index 057b5a1482..9787872593 100644 --- a/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp +++ b/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp @@ -4,6 +4,7 @@ * */ +#include "Common/Qt/Options/BatchWidget.h" #include "CommonFramework/GlobalSettingsPanel.h" #include "DiscordSettingsOption.h" diff --git a/SerialPrograms/Source/Integrations/DiscordWebhook.cpp b/SerialPrograms/Source/Integrations/DiscordWebhook.cpp index e44d9dbd01..30e58621a6 100644 --- a/SerialPrograms/Source/Integrations/DiscordWebhook.cpp +++ b/SerialPrograms/Source/Integrations/DiscordWebhook.cpp @@ -5,13 +5,11 @@ */ #include -#ifdef QT_CORE_LIB #include #include #include #include #include -#endif #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Logging/GlobalLogger.h" #include "Common/Cpp/Json/JsonArray.h" @@ -31,7 +29,7 @@ namespace Integration{ namespace DiscordWebhook{ -#ifdef QT_CORE_LIB + DiscordWebhookSender::DiscordWebhookSender() : m_logger(global_logger_raw(), "DiscordWebhookSender") , m_stopping(false) @@ -258,7 +256,7 @@ void DiscordWebhookSender::internal_send( std::lock_guard lg(m_send_lock); m_event_loop.reset(); } -#endif + void send_embed( @@ -297,7 +295,7 @@ void send_embed( if (!embeds.empty()){ json["embeds"] = embeds.clone(); } - #ifdef QT_CORE_LIB + DiscordWebhookSender::instance().send( logger, QString::fromStdString(url.url), @@ -305,7 +303,6 @@ void send_embed( std::move(json), file ); - #endif } } @@ -345,7 +342,7 @@ void send_embed( if (!embeds.empty()){ json["embeds"] = embeds.clone(); } - #ifdef QT_CORE_LIB + DiscordWebhookSender::instance().send( logger, QString::fromStdString(url.url), @@ -353,7 +350,6 @@ void send_embed( std::move(json), files ); - #endif } } diff --git a/SerialPrograms/Source/Integrations/DiscordWebhook.h b/SerialPrograms/Source/Integrations/DiscordWebhook.h index b1b162e781..425d3ac7f3 100644 --- a/SerialPrograms/Source/Integrations/DiscordWebhook.h +++ b/SerialPrograms/Source/Integrations/DiscordWebhook.h @@ -8,9 +8,7 @@ #define PokemonAutomation_DiscordWebhook_H #include -#ifdef QT_CORE_LIB #include -#endif #include "Common/Cpp/Time.h" #include "Common/Cpp/Concurrency/Mutex.h" #include "Common/Cpp/Concurrency/ConditionVariable.h" @@ -34,7 +32,7 @@ struct DiscordFileAttachment{ std::string filepath; }; -#ifdef QT_CORE_LIB + class DiscordWebhookSender : public QObject{ Q_OBJECT @@ -90,7 +88,7 @@ class DiscordWebhookSender : public QObject{ std::deque m_sent; ScheduledTaskRunner m_queue; }; -#endif + diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp index 379c42870c..246226a6ff 100644 --- a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp @@ -308,12 +308,14 @@ bool PABotBase2_OemController::run_preconnect_configure( } } +#ifdef QT_CORE_LIB NintendoSwitch::ControllerProfile profile = PokemonAutomation::NintendoSwitch::ConsoleSettings::instance().CONTROLLER_SETTINGS.get_or_make_profile( controller_mac_address, "", controller_type ); +#endif #if _WIN32 #pragma pack(push, 1) @@ -330,8 +332,9 @@ bool PABotBase2_OemController::run_preconnect_configure( #if _WIN32 #pragma pack(pop) #endif - Message message; + Message message{}; + #ifdef QT_CORE_LIB { Color color(profile.body_color); message.colors.body[0] = color.red(); @@ -356,6 +359,7 @@ bool PABotBase2_OemController::run_preconnect_configure( message.colors.right_grip[1] = color.green(); message.colors.right_grip[2] = color.blue(); } + #endif message.request.message_bytes = sizeof(message); diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp index 3e60ada3f1..e654990e7f 100644 --- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp +++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp @@ -161,7 +161,9 @@ ConsoleSettings::ConsoleSettings() ) , KEYBOARD_SECTION("Keyboard to Controller Mappings:") { +#ifdef QT_CORE_LIB PA_ADD_OPTION(CONTROLLER_SETTINGS); +#endif PA_ADD_OPTION(TRUST_USER_CONSOLE_SELECTION); PA_ADD_OPTION(BLIND_START_GAME_MASH); PA_ADD_OPTION(CLOSE_GAME_DELAY); diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h index a7517f41fb..21e5d4927d 100644 --- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h +++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h @@ -13,7 +13,9 @@ #include "Common/Cpp/Options/TimeDurationOption.h" // #include "CommonFramework/Panels/SettingsPanel.h" #include "Options/NintendoSwitch_CodeEntrySettingsOption.h" +#ifdef QT_CORE_LIB #include "Controllers/NintendoSwitch_ControllerSettings.h" +#endif #include "Controllers/NintendoSwitch_KeyboardMapping.h" namespace PokemonAutomation{ @@ -40,7 +42,9 @@ class ConsoleSettings : public BatchOption{ public: static ConsoleSettings& instance(); +#ifdef QT_CORE_LIB ControllerSettingsTable CONTROLLER_SETTINGS; +#endif BooleanCheckBoxOption TRUST_USER_CONSOLE_SELECTION; MillisecondsOption BLIND_START_GAME_MASH; diff --git a/SerialPrograms/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake index 5d3f820fa7..90f8879025 100644 --- a/SerialPrograms/cmake/SourceFiles.cmake +++ b/SerialPrograms/cmake/SourceFiles.cmake @@ -191,50 +191,18 @@ file(GLOB CORE_LIBRARY_SOURCES ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.cpp ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h ../Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h - Source/CommonFramework/AudioPipeline/AudioConstants.h - Source/CommonFramework/AudioPipeline/AudioFeed.h - Source/CommonFramework/AudioPipeline/AudioInfo.cpp - Source/CommonFramework/AudioPipeline/AudioInfo.h - Source/CommonFramework/AudioPipeline/AudioOption.cpp - Source/CommonFramework/AudioPipeline/AudioOption.h - Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h - Source/CommonFramework/AudioPipeline/AudioPipelineOptions.h - Source/CommonFramework/AudioPipeline/AudioSession.cpp - Source/CommonFramework/AudioPipeline/AudioSession.h - Source/CommonFramework/AudioPipeline/AudioStream.cpp - Source/CommonFramework/AudioPipeline/AudioStream.h - Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.cpp - Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.h - Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.cpp - Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h - Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.cpp - Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.h Source/CommonFramework/Environment/Environment.cpp Source/CommonFramework/Environment/Environment.h Source/CommonFramework/Environment/Environment_Linux.h Source/CommonFramework/Environment/Environment_Linux.tpp Source/CommonFramework/Environment/Environment_Windows.h Source/CommonFramework/Environment/Environment_Windows.tpp - Source/CommonFramework/Environment/SystemSleep.cpp - Source/CommonFramework/Environment/SystemSleep.h - Source/CommonFramework/Environment/SystemSleep_Apple.tpp - Source/CommonFramework/Environment/SystemSleep_Linux.tpp - Source/CommonFramework/Environment/SystemSleep_Windows.tpp - Source/CommonFramework/ErrorReports/ErrorReports.cpp - Source/CommonFramework/ErrorReports/ErrorReports.h - Source/CommonFramework/ErrorReports/ProgramDumper.cpp - Source/CommonFramework/ErrorReports/ProgramDumper.h - Source/CommonFramework/ErrorReports/ProgramDumper_Windows.tpp - Source/CommonFramework/Exceptions/OperationFailedException.cpp - Source/CommonFramework/Exceptions/OperationFailedException.h Source/CommonFramework/GlobalAutoPaths.cpp Source/CommonFramework/GlobalAutoPaths.h Source/CommonFramework/Globals.cpp Source/CommonFramework/Globals.h Source/CommonFramework/GlobalServices.cpp Source/CommonFramework/GlobalServices.h - Source/CommonFramework/GlobalSettingsPanel.cpp - Source/CommonFramework/GlobalSettingsPanel.h Source/CommonFramework/ImageTypes/ImageRGB32.cpp Source/CommonFramework/ImageTypes/ImageRGB32.h Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp @@ -243,15 +211,6 @@ file(GLOB CORE_LIBRARY_SOURCES Source/CommonFramework/ImageTypes/ImageViewRGB32.h Source/CommonFramework/Logging/Logger.cpp Source/CommonFramework/Logging/Logger.h - Source/CommonFramework/Notifications/EventNotificationOption.cpp - Source/CommonFramework/Notifications/EventNotificationOption.h - Source/CommonFramework/Notifications/EventNotificationsTable.cpp - Source/CommonFramework/Notifications/EventNotificationsTable.h - Source/CommonFramework/Notifications/MessageAttachment.cpp - Source/CommonFramework/Notifications/MessageAttachment.h - Source/CommonFramework/Notifications/ProgramInfo.h - Source/CommonFramework/Notifications/ProgramNotifications.cpp - Source/CommonFramework/Notifications/ProgramNotifications.h Source/CommonFramework/Options/CheckForUpdatesOption.h Source/CommonFramework/Options/Environment/CoreAffinityOption.cpp Source/CommonFramework/Options/Environment/CoreAffinityOption.h @@ -260,55 +219,8 @@ file(GLOB CORE_LIBRARY_SOURCES Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp Source/CommonFramework/Options/Environment/ProcessorLevelOption.h Source/CommonFramework/Options/Environment/ProcessPriorityOption.h - Source/CommonFramework/Options/Environment/SleepSuppressOption.cpp - Source/CommonFramework/Options/Environment/SleepSuppressOption.h - Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp - Source/CommonFramework/Options/Environment/ThemeSelectorOption.h - Source/CommonFramework/Options/LabelCellOption.cpp - Source/CommonFramework/Options/LabelCellOption.h - Source/CommonFramework/Options/ResolutionOption.cpp - Source/CommonFramework/Options/ResolutionOption.h - Source/CommonFramework/Options/ScreenshotFormatOption.h Source/CommonFramework/Options/ThreadPoolOption.cpp Source/CommonFramework/Options/ThreadPoolOption.h - Source/CommonFramework/Panels/PanelDescriptor.cpp - Source/CommonFramework/Panels/PanelDescriptor.h - Source/CommonFramework/Panels/PanelInstance.cpp - Source/CommonFramework/Panels/PanelInstance.h - Source/CommonFramework/Panels/PanelTools.h - Source/CommonFramework/Panels/ProgramDescriptor.cpp - Source/CommonFramework/Panels/ProgramDescriptor.h - Source/CommonFramework/Panels/SettingsPanel.cpp - Source/CommonFramework/Panels/SettingsPanel.h - Source/CommonFramework/PersistentSettings.cpp - Source/CommonFramework/PersistentSettings.h - Source/CommonFramework/ProgramSession.cpp - Source/CommonFramework/ProgramSession.h - Source/CommonFramework/ProgramStats/StatsDatabase.cpp - Source/CommonFramework/ProgramStats/StatsDatabase.h - Source/CommonFramework/ProgramStats/StatsTracking.cpp - Source/CommonFramework/ProgramStats/StatsTracking.h - Source/CommonFramework/Recording/StreamHistoryOption.cpp - Source/CommonFramework/Recording/StreamHistoryOption.h - Source/CommonFramework/Recording/StreamHistorySession.cpp - Source/CommonFramework/Recording/StreamHistorySession.h - Source/CommonFramework/Recording/StreamHistoryTracker_Null.h - Source/CommonFramework/ResourceDownload/DownloadThread.cpp - Source/CommonFramework/ResourceDownload/DownloadThread.h - Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp - Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h - Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.cpp - Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h - Source/CommonFramework/ResourceDownload/ResourceDownload.cpp - Source/CommonFramework/ResourceDownload/ResourceDownload.h - Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp - Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.h - Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp - Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.h - Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.cpp - Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.h - Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp - Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.h Source/CommonFramework/StaticGlobals.cpp Source/CommonFramework/StaticGlobals.h Source/CommonFramework/Tools/FileHash.cpp @@ -317,29 +229,8 @@ file(GLOB CORE_LIBRARY_SOURCES Source/CommonFramework/Tools/FileUnzip.h Source/CommonFramework/Tools/GlobalThreadPools.cpp Source/CommonFramework/Tools/GlobalThreadPools.h - Source/CommonFramework/Tools/ProgramEnvironment.cpp - Source/CommonFramework/Tools/ProgramEnvironment.h Source/CommonFramework/Tools/StatAccumulator.cpp Source/CommonFramework/Tools/StatAccumulator.h - Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp - Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h - Source/CommonFramework/VideoPipeline/CameraInfo.h - Source/CommonFramework/VideoPipeline/VideoFeed.h - Source/CommonFramework/VideoPipeline/VideoFormats.cpp - Source/CommonFramework/VideoPipeline/VideoFormats.h - Source/CommonFramework/VideoPipeline/VideoPipelineOptions.h - Source/CommonFramework/VideoPipeline/VideoSession.cpp - Source/CommonFramework/VideoPipeline/VideoSession.h - Source/CommonFramework/VideoPipeline/VideoSource.cpp - Source/CommonFramework/VideoPipeline/VideoSource.h - Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp - Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.h - Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Camera.cpp - Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Camera.h - Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Null.cpp - Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Null.h - Source/CommonFramework/Windows/DpiScaler.cpp - Source/CommonFramework/Windows/DpiScaler.h Source/CommonTools/Async/InterruptableCommands.cpp Source/CommonTools/Async/InterruptableCommands.h Source/CommonTools/Async/InterruptableCommands.tpp @@ -366,7 +257,6 @@ file(GLOB CORE_LIBRARY_SOURCES Source/Controllers/ControllerOption.h Source/Controllers/ControllerSession.cpp Source/Controllers/ControllerSession.h - Source/Controllers/ControllerSettings.h Source/Controllers/ControllerState.cpp Source/Controllers/ControllerState.h Source/Controllers/ControllerStatusThread.h @@ -404,24 +294,8 @@ file(GLOB CORE_LIBRARY_SOURCES Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.h Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.h - Source/Integrations/DiscordIntegrationSettings.cpp - Source/Integrations/DiscordIntegrationSettings.h - Source/Integrations/DiscordIntegrationTable.cpp - Source/Integrations/DiscordIntegrationTable.h - Source/Integrations/DiscordSettingsOption.cpp - Source/Integrations/DiscordSettingsOption.h - Source/Integrations/DiscordWebhook.cpp - Source/Integrations/DiscordWebhook.h - Source/Integrations/DiscordWebhookSettings.cpp - Source/Integrations/DiscordWebhookSettings.h - Source/Integrations/ProgramTracker.cpp - Source/Integrations/ProgramTracker.h Source/Integrations/PybindSwitchController.cpp Source/Integrations/PybindSwitchController.h - Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp - Source/Kernels/AbsFFT/Kernels_AbsFFT.h - Source/Kernels/AudioStreamConversion/AudioStreamConversion.cpp - Source/Kernels/AudioStreamConversion/AudioStreamConversion.h Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp @@ -454,8 +328,6 @@ file(GLOB CORE_LIBRARY_SOURCES Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.h Source/NintendoSwitch/NintendoSwitch_Settings.cpp Source/NintendoSwitch/NintendoSwitch_Settings.h - Source/NintendoSwitch/NintendoSwitch_SettingsPanel.cpp - Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.cpp Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.cpp @@ -506,6 +378,9 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/Options/RandomCodeOption.cpp ../Common/Cpp/Options/RandomCodeOption.h ../Common/Cpp/Options/TextEditOption.cpp + + + ../Common/Cpp/Options/TextEditOption.h ../Common/Cpp/Options/TimeExpressionOption.cpp ../Common/Cpp/Options/TimeExpressionOption.h @@ -514,19 +389,25 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/Rectangle.h ../Common/Cpp/Rectangle.tpp ../Common/Cpp/SIMDDebuggers.h - ../Common/Cpp/StreamConnections/MockDevice.cpp - ../Common/Cpp/StreamConnections/MockDevice.h ../Common/Cpp/Sockets/AbstractClientSocket.h ../Common/Cpp/Sockets/ClientSocket.cpp ../Common/Cpp/Sockets/ClientSocket.h ../Common/Cpp/Sockets/ClientSocket_POSIX.h ../Common/Cpp/Sockets/ClientSocket_Qt.h ../Common/Cpp/Sockets/ClientSocket_WinSocket.h - ../Common/Cpp/TestRunners/UnitTest.h - ../Common/Cpp/TestRunners/UnitTestDatabase.h + ../Common/Cpp/StreamConnections/MockDevice.cpp + ../Common/Cpp/StreamConnections/MockDevice.h ../Common/Cpp/TestRunners/ParallelUnitTestRunner.cpp ../Common/Cpp/TestRunners/ParallelUnitTestRunner.h + ../Common/Cpp/TestRunners/UnitTest.h + + + ../Common/Cpp/TestRunners/UnitTestDatabase.h ../Common/Cpp/ValueDebouncer.h + + + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.cpp + ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.h ../Common/Qt/AutoHeightTable.cpp ../Common/Qt/AutoHeightTable.h ../Common/Qt/AutoWidthLineEdit.cpp @@ -534,20 +415,23 @@ file(GLOB LIBRARY_SOURCES ../Common/Qt/CheckboxDropdown.h ../Common/Qt/CodeValidator.cpp ../Common/Qt/CodeValidator.h + + ../Common/Qt/CollapsibleGroupBox.cpp ../Common/Qt/CollapsibleGroupBox.h ../Common/Qt/GlobalThreadPoolsQt.cpp ../Common/Qt/GlobalThreadPoolsQt.h ../Common/Qt/NoWheelComboBox.h - ../Common/Qt/QtThreadPool.cpp - ../Common/Qt/QtThreadPool.h ../Common/Qt/Options/BatchWidget.cpp ../Common/Qt/Options/BatchWidget.h ../Common/Qt/Options/BooleanCheckBoxWidget.cpp ../Common/Qt/Options/BooleanCheckBoxWidget.h ../Common/Qt/Options/BoxFloatWidget.cpp + ../Common/Qt/Options/BoxFloatWidget.h ../Common/Qt/Options/ButtonWidget.cpp + + ../Common/Qt/Options/ButtonWidget.h ../Common/Qt/Options/CheckboxDropdownWidget.cpp ../Common/Qt/Options/CheckboxDropdownWidget.h @@ -566,8 +450,10 @@ file(GLOB LIBRARY_SOURCES ../Common/Qt/Options/FloatingPointWidget.cpp ../Common/Qt/Options/FloatingPointWidget.h ../Common/Qt/Options/GroupWidget.cpp + ../Common/Qt/Options/GroupWidget.h ../Common/Qt/Options/IntegerRangeWidget.cpp + ../Common/Qt/Options/IntegerRangeWidget.h ../Common/Qt/Options/MacAddressWidget.cpp ../Common/Qt/Options/MacAddressWidget.h @@ -580,15 +466,21 @@ file(GLOB LIBRARY_SOURCES ../Common/Qt/Options/StaticTableWidget.cpp ../Common/Qt/Options/StaticTableWidget.h ../Common/Qt/Options/StaticTextWidget.cpp + ../Common/Qt/Options/StaticTextWidget.h ../Common/Qt/Options/StringWidget.cpp ../Common/Qt/Options/StringWidget.h ../Common/Qt/Options/TextEditWidget.cpp + ../Common/Qt/Options/TextEditWidget.h ../Common/Qt/Options/TimeDurationWidget.cpp ../Common/Qt/Options/TimeDurationWidget.h + ../Common/Qt/Options/TimeExpressionWidget.cpp ../Common/Qt/Options/TimeExpressionWidget.h + ../Common/Qt/QtThreadPool.cpp + ../Common/Qt/QtThreadPool.h + ../Common/Qt/Redispatch.cpp ../Common/Qt/Redispatch.h ../Common/Qt/ShutdownWithEvents.h @@ -600,13 +492,23 @@ file(GLOB LIBRARY_SOURCES ../Common/Qt/UiStateQtWidget.h ../Common/Qt/WidgetStackFixedAspectRatio.cpp ../Common/Qt/WidgetStackFixedAspectRatio.h - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.cpp - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.h ../Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h ../Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h ../Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h ../Common/SerialPABotBase/SerialPABotBase_Protocol.h + Source/CommonFramework/AudioPipeline/AudioConstants.h + Source/CommonFramework/AudioPipeline/AudioFeed.h + Source/CommonFramework/AudioPipeline/AudioInfo.cpp + Source/CommonFramework/AudioPipeline/AudioInfo.h Source/CommonFramework/AudioPipeline/AudioNormalization.h + Source/CommonFramework/AudioPipeline/AudioOption.cpp + Source/CommonFramework/AudioPipeline/AudioOption.h + Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h + Source/CommonFramework/AudioPipeline/AudioPipelineOptions.h + Source/CommonFramework/AudioPipeline/AudioSession.cpp + Source/CommonFramework/AudioPipeline/AudioSession.h + Source/CommonFramework/AudioPipeline/AudioStream.cpp + Source/CommonFramework/AudioPipeline/AudioStream.h Source/CommonFramework/AudioPipeline/AudioTemplate.cpp Source/CommonFramework/AudioPipeline/AudioTemplate.h Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp @@ -619,6 +521,12 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/AudioPipeline/IO/AudioSink.h Source/CommonFramework/AudioPipeline/IO/AudioSource.cpp Source/CommonFramework/AudioPipeline/IO/AudioSource.h + Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.cpp + Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.h + Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.cpp + Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h + Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.cpp + Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.h Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h Source/CommonFramework/AudioPipeline/Tools/AudioNormalization.h @@ -635,13 +543,27 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Environment/HardwareValidation.h Source/CommonFramework/Environment/HardwareValidation_arm64.tpp Source/CommonFramework/Environment/HardwareValidation_x86.tpp + Source/CommonFramework/Environment/SystemSleep.cpp + Source/CommonFramework/Environment/SystemSleep.h + Source/CommonFramework/Environment/SystemSleep_Apple.tpp + Source/CommonFramework/Environment/SystemSleep_Linux.tpp + Source/CommonFramework/Environment/SystemSleep_Windows.tpp + Source/CommonFramework/ErrorReports/ErrorReports.cpp + Source/CommonFramework/ErrorReports/ErrorReports.h + Source/CommonFramework/ErrorReports/ProgramDumper.cpp + Source/CommonFramework/ErrorReports/ProgramDumper.h + Source/CommonFramework/ErrorReports/ProgramDumper_Windows.tpp Source/CommonFramework/Exceptions/FatalProgramException.cpp Source/CommonFramework/Exceptions/FatalProgramException.h + Source/CommonFramework/Exceptions/OperationFailedException.cpp + Source/CommonFramework/Exceptions/OperationFailedException.h Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h Source/CommonFramework/Exceptions/ProgramFinishedException.cpp Source/CommonFramework/Exceptions/ProgramFinishedException.h Source/CommonFramework/Exceptions/UnexpectedBattleException.h + Source/CommonFramework/GlobalSettingsPanel.cpp + Source/CommonFramework/GlobalSettingsPanel.h Source/CommonFramework/ImageTools/FloatPixel.cpp Source/CommonFramework/ImageTools/FloatPixel.h Source/CommonFramework/ImageTools/ImageBoxes.cpp @@ -667,20 +589,47 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Logging/OutputRedirector.h Source/CommonFramework/Logging/QueuedLogger.cpp Source/CommonFramework/Logging/QueuedLogger.h + Source/CommonFramework/Notifications/EventNotificationOption.cpp + Source/CommonFramework/Notifications/EventNotificationOption.h + Source/CommonFramework/Notifications/EventNotificationsTable.cpp + Source/CommonFramework/Notifications/EventNotificationsTable.h Source/CommonFramework/Notifications/EventNotificationWidget.cpp Source/CommonFramework/Notifications/EventNotificationWidget.h + Source/CommonFramework/Notifications/MessageAttachment.cpp + Source/CommonFramework/Notifications/MessageAttachment.h + Source/CommonFramework/Notifications/ProgramInfo.h + Source/CommonFramework/Notifications/ProgramNotifications.cpp + Source/CommonFramework/Notifications/ProgramNotifications.h Source/CommonFramework/Notifications/SenderNotificationTable.cpp Source/CommonFramework/Notifications/SenderNotificationTable.h Source/CommonFramework/Options/BoxOption.cpp Source/CommonFramework/Options/BoxOption.h Source/CommonFramework/Options/Environment/OnnxOptions.h + Source/CommonFramework/Options/Environment/SleepSuppressOption.cpp + Source/CommonFramework/Options/Environment/SleepSuppressOption.h + Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp + Source/CommonFramework/Options/Environment/ThemeSelectorOption.h + Source/CommonFramework/Options/LabelCellOption.cpp + Source/CommonFramework/Options/LabelCellOption.h Source/CommonFramework/Options/NestedBoxDrawOption.cpp Source/CommonFramework/Options/NestedBoxDrawOption.h Source/CommonFramework/Options/QtWidget/LabelCellWidget.cpp Source/CommonFramework/Options/QtWidget/LabelCellWidget.h + Source/CommonFramework/Options/ResolutionOption.cpp + Source/CommonFramework/Options/ResolutionOption.h + Source/CommonFramework/Options/ScreenshotFormatOption.h Source/CommonFramework/Panels/ConsoleSettingsStretch.h + Source/CommonFramework/Panels/PanelDescriptor.cpp + Source/CommonFramework/Panels/PanelDescriptor.h + Source/CommonFramework/Panels/PanelInstance.cpp + Source/CommonFramework/Panels/PanelInstance.h Source/CommonFramework/Panels/PanelList.cpp Source/CommonFramework/Panels/PanelList.h + Source/CommonFramework/Panels/PanelTools.h + Source/CommonFramework/Panels/ProgramDescriptor.cpp + Source/CommonFramework/Panels/ProgramDescriptor.h + Source/CommonFramework/Panels/SettingsPanel.cpp + Source/CommonFramework/Panels/SettingsPanel.h Source/CommonFramework/Panels/UI/PanelElements.cpp Source/CommonFramework/Panels/UI/PanelElements.h Source/CommonFramework/Panels/UI/PanelListWidget.cpp @@ -689,14 +638,43 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Panels/UI/PanelWidget.h Source/CommonFramework/Panels/UI/SettingsPanelWidget.cpp Source/CommonFramework/Panels/UI/SettingsPanelWidget.h + Source/CommonFramework/PersistentSettings.cpp + Source/CommonFramework/PersistentSettings.h + Source/CommonFramework/ProgramSession.cpp + Source/CommonFramework/ProgramSession.h + Source/CommonFramework/ProgramStats/StatsDatabase.cpp + Source/CommonFramework/ProgramStats/StatsDatabase.h + Source/CommonFramework/ProgramStats/StatsTracking.cpp + Source/CommonFramework/ProgramStats/StatsTracking.h + Source/CommonFramework/Recording/StreamHistoryOption.cpp + Source/CommonFramework/Recording/StreamHistoryOption.h + Source/CommonFramework/Recording/StreamHistorySession.cpp + Source/CommonFramework/Recording/StreamHistorySession.h + Source/CommonFramework/Recording/StreamHistoryTracker_Null.h Source/CommonFramework/Recording/StreamHistoryTracker_ParallelStreams.h Source/CommonFramework/Recording/StreamHistoryTracker_RecordOnTheFly.h Source/CommonFramework/Recording/StreamHistoryTracker_SaveFrames.cpp Source/CommonFramework/Recording/StreamHistoryTracker_SaveFrames.h Source/CommonFramework/Recording/StreamRecorder.cpp Source/CommonFramework/Recording/StreamRecorder.h + Source/CommonFramework/ResourceDownload/DownloadThread.cpp + Source/CommonFramework/ResourceDownload/DownloadThread.h + Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp + Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h + Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.cpp + Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.h + Source/CommonFramework/ResourceDownload/ResourceDownload.cpp + Source/CommonFramework/ResourceDownload/ResourceDownload.h + Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp + Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.h + Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp + Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.h + Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.cpp + Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.h + Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp + Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.h Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.h Source/CommonFramework/Startup/NewVersionCheck.cpp @@ -709,8 +687,12 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/Tools/ErrorDumper.h Source/CommonFramework/Tools/FileDownloader.cpp Source/CommonFramework/Tools/FileDownloader.h + Source/CommonFramework/Tools/ProgramEnvironment.cpp + Source/CommonFramework/Tools/ProgramEnvironment.h Source/CommonFramework/Tools/VideoStream.cpp Source/CommonFramework/Tools/VideoStream.h + Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp + Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.h Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp @@ -729,6 +711,7 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/VideoPipeline/Backends/SnapshotManager.h Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.h + Source/CommonFramework/VideoPipeline/CameraInfo.h Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.cpp Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.h Source/CommonFramework/VideoPipeline/Stats/MemoryUtilizationStats.cpp @@ -743,6 +726,9 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.h + Source/CommonFramework/VideoPipeline/VideoFeed.h + Source/CommonFramework/VideoPipeline/VideoFormats.cpp + Source/CommonFramework/VideoPipeline/VideoFormats.h Source/CommonFramework/VideoPipeline/VideoOverlay.cpp Source/CommonFramework/VideoPipeline/VideoOverlay.h Source/CommonFramework/VideoPipeline/VideoOverlayOption.cpp @@ -752,10 +738,23 @@ file(GLOB LIBRARY_SOURCES Source/CommonFramework/VideoPipeline/VideoOverlaySession.h Source/CommonFramework/VideoPipeline/VideoOverlayTypes.cpp Source/CommonFramework/VideoPipeline/VideoOverlayTypes.h + Source/CommonFramework/VideoPipeline/VideoPipelineOptions.h + Source/CommonFramework/VideoPipeline/VideoSession.cpp + Source/CommonFramework/VideoPipeline/VideoSession.h + Source/CommonFramework/VideoPipeline/VideoSource.cpp + Source/CommonFramework/VideoPipeline/VideoSource.h + Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.cpp + Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.h + Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Camera.cpp + Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Camera.h + Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Null.cpp + Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_Null.h Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.cpp Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.h Source/CommonFramework/Windows/ButtonDiagram.cpp Source/CommonFramework/Windows/ButtonDiagram.h + Source/CommonFramework/Windows/DpiScaler.cpp + Source/CommonFramework/Windows/DpiScaler.h Source/CommonFramework/Windows/MainWindow.cpp Source/CommonFramework/Windows/MainWindow.h Source/CommonFramework/Windows/WindowTracker.cpp @@ -882,8 +881,6 @@ file(GLOB LIBRARY_SOURCES Source/CommonTools/VisualDetectors/ImageMatchDetector.h Source/ComputerPrograms/ComputerProgram.cpp Source/ComputerPrograms/ComputerProgram.h - Source/ComputerPrograms/UnitTestRunner.cpp - Source/ComputerPrograms/UnitTestRunner.h Source/ComputerPrograms/Framework/ComputerProgramOption.cpp Source/ComputerPrograms/Framework/ComputerProgramOption.h Source/ComputerPrograms/Framework/ComputerProgramSession.cpp @@ -910,6 +907,7 @@ file(GLOB LIBRARY_SOURCES Source/ControllerInput/Keyboard/KeyboardInput_StateTracker.h Source/Controllers/ControllerSelectorWidget.cpp Source/Controllers/ControllerSelectorWidget.h + Source/Controllers/ControllerSettings.h Source/Controllers/ControllerStateTable.cpp Source/Controllers/ControllerStateTable.h Source/Controllers/NullControllerWidget.cpp @@ -919,8 +917,18 @@ file(GLOB LIBRARY_SOURCES Source/Controllers/PABotBase2/SerialPABotBase_StatusThread.h Source/Controllers/SerialPort/SerialPortPollerQt.cpp Source/Controllers/SerialPort/SerialPortPollerQt.h + Source/Integrations/DiscordIntegrationSettings.cpp + Source/Integrations/DiscordIntegrationSettings.h + Source/Integrations/DiscordIntegrationTable.cpp + Source/Integrations/DiscordIntegrationTable.h + Source/Integrations/DiscordSettingsOption.cpp + Source/Integrations/DiscordSettingsOption.h Source/Integrations/DiscordSocial/DiscordSocial.cpp Source/Integrations/DiscordSocial/DiscordSocial.h + Source/Integrations/DiscordWebhook.cpp + Source/Integrations/DiscordWebhook.h + Source/Integrations/DiscordWebhookSettings.cpp + Source/Integrations/DiscordWebhookSettings.h Source/Integrations/DppIntegration/DppClient.cpp Source/Integrations/DppIntegration/DppClient.h Source/Integrations/DppIntegration/DppCommandHandler.cpp @@ -929,6 +937,10 @@ file(GLOB LIBRARY_SOURCES Source/Integrations/DppIntegration/DppUtility.h Source/Integrations/IntegrationsAPI.cpp Source/Integrations/IntegrationsAPI.h + Source/Integrations/ProgramTracker.cpp + Source/Integrations/ProgramTracker.h + Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp + Source/Kernels/AbsFFT/Kernels_AbsFFT.h Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch.h Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_Default.h Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX2.h @@ -950,10 +962,13 @@ file(GLOB LIBRARY_SOURCES Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.tpp Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.cpp Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.h + Source/Kernels/AudioStreamConversion/AudioStreamConversion.cpp + Source/Kernels/AudioStreamConversion/AudioStreamConversion.h Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_Default.cpp Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_x86_SSE41.cpp Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.cpp Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h + Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_arm64_NEON.h Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x16_x64_AVX2.cpp Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x32_x64_AVX512.cpp Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x4_Default.cpp @@ -962,23 +977,12 @@ file(GLOB LIBRARY_SOURCES Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_x64_SSE42.cpp Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Default.h Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Routines.h - Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_arm64_NEON.h Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX2.h Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX512.h Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_SSE42.h Source/Kernels/BinaryImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.h Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.cpp Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.h - Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp - Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.h - Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x16_x64_AVX2.h - Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x32_x64_AVX512.h - Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x4_Default.h - Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x64_x64_AVX512.h - Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_arm64_NEON.h - Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_x64_SSE42.h - Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64xH_Default.h - Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_Debugging.h Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x16_x64_AVX2.h Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x32_x64_AVX512.h Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x4_Default.h @@ -993,6 +997,16 @@ file(GLOB LIBRARY_SOURCES Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64xH_Default.cpp Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_arm64_NEON.cpp Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_t.h + Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp + Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.h + Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x16_x64_AVX2.h + Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x32_x64_AVX512.h + Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x4_Default.h + Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x64_x64_AVX512.h + Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_arm64_NEON.h + Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_x64_SSE42.h + Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64xH_Default.h + Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_Debugging.h Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrix.h Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.h Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.tpp @@ -1036,29 +1050,29 @@ file(GLOB LIBRARY_SOURCES Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_SSE42.cpp Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.h + Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_arm64_NEON.cpp + Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Default.cpp Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.h - Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Default.cpp - Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_arm64_NEON.cpp Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX2.cpp Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX512.cpp Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_SSE41.cpp Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.cpp Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.h + Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp + Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX2.cpp + Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX512.cpp + Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_SSE41.cpp Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.cpp Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.h Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX2.cpp Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX512.cpp Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_SSE41.cpp - Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp - Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX2.cpp - Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX512.cpp - Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_SSE41.cpp Source/Kernels/Kernels_Alignment.h + Source/Kernels/Kernels_arm64_NEON.h Source/Kernels/Kernels_BitScan.h Source/Kernels/Kernels_BitSet.h - Source/Kernels/Kernels_arm64_NEON.h Source/Kernels/Kernels_Tests.cpp Source/Kernels/Kernels_Tests.h Source/Kernels/Kernels_x64_AVX2.h @@ -1118,10 +1132,10 @@ file(GLOB LIBRARY_SOURCES Source/ML/DataLabeling/ML_SegmentAnythingModelConstants.h Source/ML/Inference/ML_PaddleOCRPipeline.cpp Source/ML/Inference/ML_PaddleOCRPipeline.h - Source/ML/Inference/ML_YOLOv5Detector.cpp - Source/ML/Inference/ML_YOLOv5Detector.h Source/ML/Inference/ML_YOLONavigation.cpp Source/ML/Inference/ML_YOLONavigation.h + Source/ML/Inference/ML_YOLOv5Detector.cpp + Source/ML/Inference/ML_YOLOv5Detector.h Source/ML/ML_Panels.cpp Source/ML/ML_Panels.h Source/ML/Models/ML_ONNXRuntimeHelpers.cpp @@ -1231,6 +1245,8 @@ file(GLOB LIBRARY_SOURCES Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h Source/NintendoSwitch/NintendoSwitch_Panels.cpp Source/NintendoSwitch/NintendoSwitch_Panels.h + Source/NintendoSwitch/NintendoSwitch_SettingsPanel.cpp + Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.cpp @@ -1247,13 +1263,13 @@ file(GLOB LIBRARY_SOURCES Source/NintendoSwitch/Programs/DateManip/NintendoSwitch2_DateSkippers.cpp Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h - Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipBase.h - Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.cpp - Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.h Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.h Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.h + Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipBase.h + Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.cpp + Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.h Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.cpp Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp @@ -1333,6 +1349,8 @@ file(GLOB LIBRARY_SOURCES Source/Pokemon/Options/Pokemon_NameSelectWidget.h Source/Pokemon/Options/Pokemon_StatsHuntFilter.cpp Source/Pokemon/Options/Pokemon_StatsHuntFilter.h + Source/Pokemon/Pokemon_AdvRng.cpp + Source/Pokemon/Pokemon_AdvRng.h Source/Pokemon/Pokemon_BdspRng.cpp Source/Pokemon/Pokemon_BdspRng.h Source/Pokemon/Pokemon_BoxCursor.cpp @@ -1364,8 +1382,6 @@ file(GLOB LIBRARY_SOURCES Source/Pokemon/Pokemon_Xoroshiro128Plus.h Source/Pokemon/Pokemon_Xorshift128.cpp Source/Pokemon/Pokemon_Xorshift128.h - Source/Pokemon/Pokemon_AdvRng.cpp - Source/Pokemon/Pokemon_AdvRng.h Source/Pokemon/Resources/Pokemon_BerryNames.cpp Source/Pokemon/Resources/Pokemon_BerryNames.h Source/Pokemon/Resources/Pokemon_BerrySprites.cpp @@ -1402,14 +1418,6 @@ file(GLOB LIBRARY_SOURCES Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.h Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.h - Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.cpp - Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.h - Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.cpp - Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.h - Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp - Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h - Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp - Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.h Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.cpp @@ -1426,6 +1434,14 @@ file(GLOB LIBRARY_SOURCES Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.h + Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.cpp + Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.h + Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.cpp + Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.h + Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp + Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h + Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp + Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.h Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.cpp @@ -1554,18 +1570,14 @@ file(GLOB LIBRARY_SOURCES Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.cpp Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h - Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp - Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h + Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp + Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.h Source/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp Source/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.h - Source/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp - Source/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h - Source/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp - Source/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.h Source/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp Source/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.h Source/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp @@ -1577,40 +1589,44 @@ file(GLOB LIBRARY_SOURCES Source/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp Source/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h Source/PokemonFRLG/Inference/Menus/PokemonFRLG_PartySlot.h + Source/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp + Source/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h + Source/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp + Source/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.h Source/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp Source/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.h - Source/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.cpp - Source/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.h - Source/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.cpp - Source/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.h + Source/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp + Source/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.h + Source/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp + Source/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.h Source/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp Source/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h - Source/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.cpp - Source/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h - Source/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp - Source/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h Source/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp Source/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.h Source/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp Source/PokemonFRLG/Inference/PokemonFRLG_DigitReader.h Source/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp Source/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.h - Source/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp - Source/PokemonFRLG/Inference/PokemonFRLG_StatsReader.h - Source/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp - Source/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.h - Source/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp - Source/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.h Source/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp Source/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.h - Source/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp - Source/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.h - Source/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp - Source/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.h Source/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp Source/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.h + Source/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp + Source/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.h + Source/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.cpp + Source/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h + Source/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp + Source/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h + Source/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp + Source/PokemonFRLG/Inference/PokemonFRLG_StatsReader.h + Source/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp + Source/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.h Source/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp Source/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h + Source/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.cpp + Source/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.h + Source/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.cpp + Source/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.h Source/PokemonFRLG/PokemonFRLG_Navigation.cpp Source/PokemonFRLG/PokemonFRLG_Navigation.h Source/PokemonFRLG/PokemonFRLG_Panels.cpp @@ -1619,6 +1635,8 @@ file(GLOB LIBRARY_SOURCES Source/PokemonFRLG/PokemonFRLG_Settings.h Source/PokemonFRLG/PokemonFRLG_Tests.cpp Source/PokemonFRLG/PokemonFRLG_Tests.h + Source/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp + Source/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.h Source/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp Source/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.h Source/PokemonFRLG/Programs/Farming/PokemonFRLG_ItemDuplication.cpp @@ -1629,72 +1647,70 @@ file(GLOB LIBRARY_SOURCES Source/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.h Source/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp Source/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.h - Source/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp - Source/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.h Source/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.cpp Source/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h Source/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.cpp Source/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h - Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp - Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.h - Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp - Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.h - Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp - Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.h - Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp - Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.h - Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp - Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.h - Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp - Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.h Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.h - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.h - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngDisplays.cpp - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngDisplays.h + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.h + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EncountersDatabase.cpp + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EncountersDatabase.h + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.h Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.h + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_LocationsDatabase.cpp + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_LocationsDatabase.h Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.h + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngDisplays.cpp + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngDisplays.h + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.h Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.h + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.h Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngStatsDatabase.cpp Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngStatsDatabase.h - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_LocationsDatabase.cpp - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_LocationsDatabase.h - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EncountersDatabase.cpp - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EncountersDatabase.h + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp + Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.h Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SeedsDatabase.cpp Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SeedsDatabase.h Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.h - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.h Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.h - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.h Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.h Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.h - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.h - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp - Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.h - Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp - Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.h - Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.cpp - Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.h + Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp + Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.h + Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp + Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.h + Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp + Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.h + Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp + Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.h + Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp + Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.h + Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp + Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.h + Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp + Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.h + Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.cpp + Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.h Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.cpp Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.h Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.h - Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.cpp - Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.h - Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp - Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.h + Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp + Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.h + Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.cpp + Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.h Source/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.cpp Source/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.h Source/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp @@ -1753,8 +1769,6 @@ file(GLOB LIBRARY_SOURCES Source/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h Source/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.cpp Source/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.h - Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp - Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h Source/PokemonLA/Inference/Map/PokemonLA_MapDetector.cpp Source/PokemonLA/Inference/Map/PokemonLA_MapDetector.h Source/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp @@ -1765,6 +1779,8 @@ file(GLOB LIBRARY_SOURCES Source/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.h Source/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp Source/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h + Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp + Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h Source/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp Source/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h Source/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp @@ -1850,12 +1866,12 @@ file(GLOB LIBRARY_SOURCES Source/PokemonLA/PokemonLA_Panels.h Source/PokemonLA/PokemonLA_Settings.cpp Source/PokemonLA/PokemonLA_Settings.h + Source/PokemonLA/PokemonLA_Tests.cpp + Source/PokemonLA/PokemonLA_Tests.h Source/PokemonLA/PokemonLA_TravelLocations.cpp Source/PokemonLA/PokemonLA_TravelLocations.h Source/PokemonLA/PokemonLA_WeatherAndTime.cpp Source/PokemonLA/PokemonLA_WeatherAndTime.h - Source/PokemonLA/PokemonLA_Tests.cpp - Source/PokemonLA/PokemonLA_Tests.h Source/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp Source/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.h Source/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp @@ -2010,10 +2026,10 @@ file(GLOB LIBRARY_SOURCES Source/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.h Source/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp Source/PokemonLZA/Inference/PokemonLZA_DialogDetector.h - Source/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.cpp - Source/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.h Source/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp Source/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.h + Source/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.cpp + Source/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.h Source/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp Source/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.h Source/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp @@ -2062,18 +2078,18 @@ file(GLOB LIBRARY_SOURCES Source/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.h Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h - Source/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.cpp - Source/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h - Source/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.cpp - Source/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.h Source/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp Source/PokemonLZA/Programs/PokemonLZA_BoxSorter.h Source/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.cpp Source/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.h Source/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.cpp Source/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.h + Source/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.cpp + Source/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h Source/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp Source/PokemonLZA/Programs/PokemonLZA_GameEntry.h + Source/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.cpp + Source/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.h Source/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.cpp Source/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.h Source/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp @@ -2096,12 +2112,12 @@ file(GLOB LIBRARY_SOURCES Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.h Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.cpp Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.h + Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp + Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.h Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceHunter.cpp Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceHunter.h Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.h - Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp - Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.h Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.cpp Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.h Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShuttleRun.cpp @@ -2286,12 +2302,12 @@ file(GLOB LIBRARY_SOURCES Source/PokemonSV/Inference/PokemonSV_MenuOptionReader.h Source/PokemonSV/Inference/PokemonSV_MoneyReader.cpp Source/PokemonSV/Inference/PokemonSV_MoneyReader.h - Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.cpp - Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.h Source/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp Source/PokemonSV/Inference/PokemonSV_PokemonMovesReader.h Source/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp Source/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h + Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.cpp + Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.h Source/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp Source/PokemonSV/Inference/PokemonSV_StatHexagonReader.h Source/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp @@ -2323,10 +2339,10 @@ file(GLOB LIBRARY_SOURCES Source/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp Source/PokemonSV/Options/PokemonSV_AuctionItemTable.h Source/PokemonSV/Options/PokemonSV_AutoHostOptions.h - Source/PokemonSV/Options/PokemonSV_BBQOption.cpp - Source/PokemonSV/Options/PokemonSV_BBQOption.h Source/PokemonSV/Options/PokemonSV_BattleMoveTable.cpp Source/PokemonSV/Options/PokemonSV_BattleMoveTable.h + Source/PokemonSV/Options/PokemonSV_BBQOption.cpp + Source/PokemonSV/Options/PokemonSV_BBQOption.h Source/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.cpp Source/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h Source/PokemonSV/Options/PokemonSV_EncounterActionsTable.cpp @@ -2364,8 +2380,6 @@ file(GLOB LIBRARY_SOURCES Source/PokemonSV/PokemonSV_Tests.h Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h - Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp - Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.h Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp @@ -2448,6 +2462,8 @@ file(GLOB LIBRARY_SOURCES Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.h Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.h + Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp + Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.cpp Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOptionDatabase.cpp @@ -2823,6 +2839,8 @@ file(GLOB LIBRARY_SOURCES Source/PokemonSwSh/PokemonSwSh_Panels.h Source/PokemonSwSh/PokemonSwSh_Settings.cpp Source/PokemonSwSh/PokemonSwSh_Settings.h + Source/PokemonSwSh/PokemonSwSh_Tests.cpp + Source/PokemonSwSh/PokemonSwSh_Tests.h Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.h Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp @@ -2982,8 +3000,6 @@ file(GLOB LIBRARY_SOURCES Source/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.h Source/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp Source/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.h - Source/PokemonSwSh/PokemonSwSh_Tests.cpp - Source/PokemonSwSh/PokemonSwSh_Tests.h Source/PokemonSwSh/ShinyHuntTracker.cpp Source/PokemonSwSh/ShinyHuntTracker.h Source/StaticRegistration.h From b843ac22016365cc5ef4225864692175042a0ff9 Mon Sep 17 00:00:00 2001 From: jw098 Date: Sun, 30 Aug 2026 14:17:47 -0700 Subject: [PATCH 11/11] fix build --- SerialPrograms/cmake/SourceFiles.cmake | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/SerialPrograms/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake index 90f8879025..454ed7ffc2 100644 --- a/SerialPrograms/cmake/SourceFiles.cmake +++ b/SerialPrograms/cmake/SourceFiles.cmake @@ -378,9 +378,6 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/Options/RandomCodeOption.cpp ../Common/Cpp/Options/RandomCodeOption.h ../Common/Cpp/Options/TextEditOption.cpp - - - ../Common/Cpp/Options/TextEditOption.h ../Common/Cpp/Options/TimeExpressionOption.cpp ../Common/Cpp/Options/TimeExpressionOption.h @@ -400,12 +397,8 @@ file(GLOB LIBRARY_SOURCES ../Common/Cpp/TestRunners/ParallelUnitTestRunner.cpp ../Common/Cpp/TestRunners/ParallelUnitTestRunner.h ../Common/Cpp/TestRunners/UnitTest.h - - ../Common/Cpp/TestRunners/UnitTestDatabase.h ../Common/Cpp/ValueDebouncer.h - - ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.cpp ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.h ../Common/Qt/AutoHeightTable.cpp @@ -415,8 +408,6 @@ file(GLOB LIBRARY_SOURCES ../Common/Qt/CheckboxDropdown.h ../Common/Qt/CodeValidator.cpp ../Common/Qt/CodeValidator.h - - ../Common/Qt/CollapsibleGroupBox.cpp ../Common/Qt/CollapsibleGroupBox.h ../Common/Qt/GlobalThreadPoolsQt.cpp @@ -427,11 +418,8 @@ file(GLOB LIBRARY_SOURCES ../Common/Qt/Options/BooleanCheckBoxWidget.cpp ../Common/Qt/Options/BooleanCheckBoxWidget.h ../Common/Qt/Options/BoxFloatWidget.cpp - ../Common/Qt/Options/BoxFloatWidget.h ../Common/Qt/Options/ButtonWidget.cpp - - ../Common/Qt/Options/ButtonWidget.h ../Common/Qt/Options/CheckboxDropdownWidget.cpp ../Common/Qt/Options/CheckboxDropdownWidget.h @@ -450,10 +438,8 @@ file(GLOB LIBRARY_SOURCES ../Common/Qt/Options/FloatingPointWidget.cpp ../Common/Qt/Options/FloatingPointWidget.h ../Common/Qt/Options/GroupWidget.cpp - ../Common/Qt/Options/GroupWidget.h ../Common/Qt/Options/IntegerRangeWidget.cpp - ../Common/Qt/Options/IntegerRangeWidget.h ../Common/Qt/Options/MacAddressWidget.cpp ../Common/Qt/Options/MacAddressWidget.h @@ -466,21 +452,17 @@ file(GLOB LIBRARY_SOURCES ../Common/Qt/Options/StaticTableWidget.cpp ../Common/Qt/Options/StaticTableWidget.h ../Common/Qt/Options/StaticTextWidget.cpp - ../Common/Qt/Options/StaticTextWidget.h ../Common/Qt/Options/StringWidget.cpp ../Common/Qt/Options/StringWidget.h ../Common/Qt/Options/TextEditWidget.cpp - ../Common/Qt/Options/TextEditWidget.h ../Common/Qt/Options/TimeDurationWidget.cpp ../Common/Qt/Options/TimeDurationWidget.h - ../Common/Qt/Options/TimeExpressionWidget.cpp ../Common/Qt/Options/TimeExpressionWidget.h ../Common/Qt/QtThreadPool.cpp ../Common/Qt/QtThreadPool.h - ../Common/Qt/Redispatch.cpp ../Common/Qt/Redispatch.h ../Common/Qt/ShutdownWithEvents.h @@ -881,6 +863,8 @@ file(GLOB LIBRARY_SOURCES Source/CommonTools/VisualDetectors/ImageMatchDetector.h Source/ComputerPrograms/ComputerProgram.cpp Source/ComputerPrograms/ComputerProgram.h + Source/ComputerPrograms/UnitTestRunner.cpp + Source/ComputerPrograms/UnitTestRunner.h Source/ComputerPrograms/Framework/ComputerProgramOption.cpp Source/ComputerPrograms/Framework/ComputerProgramOption.h Source/ComputerPrograms/Framework/ComputerProgramSession.cpp