From 35278c0388141cd0d2dbacd41f079be9f2f4ccdb Mon Sep 17 00:00:00 2001 From: Di Fan <26423504+dayfine@users.noreply.github.com> Date: Sat, 31 Oct 2026 18:25:40 -0700 Subject: [PATCH] Settings: default audio display and collapsed console settings (#99) * Code health: skip nested and detail classes in the single-method interface check (#82) A class nested in another class, or in a detail or anonymous namespace, is an implementation detail such as a type-erasure base, not an interface others implement. MoveOnlyFunction's private Callable base was flagged. Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E Co-authored-by: Claude Opus 5.5 * Code health: lexical C++ style checks on added lines (#94) * Code health: skip nested and detail classes in the single-method interface check A class nested in another class, or in a detail or anonymous namespace, is an implementation detail such as a type-erasure base, not an interface others implement. MoveOnlyFunction's private Callable base was flagged. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E * Code health: lexical C++ style checks on added lines Check the lines a change adds for the upstream bans (std::filesystem, std::thread, std::mutex, std::async), control-flow brace formatting, and the Abseil tips adopted in the fork's C++ style notes: mutable globals (#103), new/delete (#126), std::bind (#108), return std::move(local) (#120), top-level const by-value header parameters (#109), bool parameters (#94), header using-directives (#153) and forward declarations. A comment that describes a neighbouring function is an advisory. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E --------- Co-authored-by: Claude Opus 5.5 * code_health: match functions to their base by name, not by signature (#95) Changing a parameter's type (std::function to MoveOnlyFunction in #90) changed the function's key, so an existing 133-line constructor was held to the new limit of 50 instead of its base length. Functions now match on their qualified name without parameters; messages still show the full signature. Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E Co-authored-by: Claude Opus 5.5 * Settings: default audio display and collapsed console settings Two global settings for people who run many programs on one lab machine: "Default Audio Display" (Audio Pipeline group) is what a program's console shows for its audio until that console's own setting is saved, so a new panel no longer opens with the frequency bars; and "Start with console settings collapsed" folds each program's "Console N Settings" box at creation, so the video is at the top. Both default to today's behavior. AudioOption takes its initial display type from the global setting instead of a fixed FREQ_BARS; a panel's saved value still wins. Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E (cherry picked from commit 92d1ed3c6f6fa0468827ab15c51ec3cc71f01d32) --------- Co-authored-by: Claude Opus 5.5 (cherry picked from commit 0e737fb48010e83e1968134da461146c86610e98) --- .../CommonFramework/AudioPipeline/AudioOption.cpp | 3 +++ .../CommonFramework/AudioPipeline/AudioOption.h | 2 +- .../AudioPipeline/AudioPipelineOptions.h | 15 +++++++++++++++ .../CommonFramework/GlobalSettingsPanel.cpp | 7 +++++++ .../Source/CommonFramework/GlobalSettingsPanel.h | 1 + .../Source/GameConsole/UI/ConsoleSystemWidget.cpp | 6 +++++- 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.cpp index 8327b7e48a..b2a1cfad58 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.cpp +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.cpp @@ -11,6 +11,8 @@ #include "Sources/AudioSource_File.h" #include "Sources/AudioSource_Device.h" #include "AudioOption.h" +#include "AudioPipelineOptions.h" +#include "CommonFramework/GlobalSettingsPanel.h" //#include //using std::cout; @@ -55,6 +57,7 @@ std::string AudioOption::audioDisplayTypeToString(AudioOption::AudioDisplayType AudioOption::AudioOption() : m_input_source(new AudioSourceDescriptor_Null()) + , m_display_type(GlobalSettings::instance().AUDIO_PIPELINE->DEFAULT_DISPLAY) {} void AudioOption::set_input(std::shared_ptr descriptor){ diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.h index 73e002f2a8..c63b0a83ee 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.h +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.h @@ -72,7 +72,7 @@ class AudioOption{ AudioInputChoice m_input_choice; AudioDeviceInfo m_output_device; - AudioDisplayType m_display_type = AudioDisplayType::FREQ_BARS; + AudioDisplayType m_display_type; // the global default until load_json() sets one double m_volume = 1.0; // Volume Range: [0, 1.0] }; diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPipelineOptions.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPipelineOptions.h index 5f4a889b8c..d0f7e3bd73 100644 --- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPipelineOptions.h +++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPipelineOptions.h @@ -11,6 +11,8 @@ #include "Common/Cpp/Options/BooleanCheckBoxOption.h" #include "Common/Cpp/Options/SimpleIntegerOption.h" #include "Common/Cpp/Options/FloatingPointOption.h" +#include "Common/Cpp/Options/EnumDropdownOption.h" +#include "CommonFramework/AudioPipeline/AudioOption.h" #include "CommonFramework/StaticGlobals.h" namespace PokemonAutomation{ @@ -26,6 +28,17 @@ class AudioPipelineOptions : public GroupOption{ true, false ) + , DEFAULT_DISPLAY( + "Default Audio Display:
" + "What a program's console shows for its audio until you pick a display in that console's settings.", + { + {AudioOption::AudioDisplayType::NO_DISPLAY, "none", "No Display"}, + {AudioOption::AudioDisplayType::FREQ_BARS, "freq-bars", "Frequency Bars"}, + {AudioOption::AudioDisplayType::SPECTROGRAM, "spectrogram", "Spectrogram"}, + }, + LockMode::UNLOCK_WHILE_RUNNING, + AudioOption::AudioDisplayType::FREQ_BARS + ) , FILE_VOLUME_SCALE( "Audio File Input Volume Scale:
" "Multiply audio file playback by this factor. (This is linear scale. So each factor of 10 is 20dB.)", @@ -58,6 +71,7 @@ class AudioPipelineOptions : public GroupOption{ 5 ) { + PA_ADD_OPTION(DEFAULT_DISPLAY); PA_ADD_OPTION(FILE_VOLUME_SCALE); PA_ADD_OPTION(DEVICE_VOLUME_SCALE); PA_ADD_OPTION(USE_KAISER_WINDOW); @@ -68,6 +82,7 @@ class AudioPipelineOptions : public GroupOption{ } public: + EnumDropdownOption DEFAULT_DISPLAY; FloatingPointOption FILE_VOLUME_SCALE; FloatingPointOption DEVICE_VOLUME_SCALE; BooleanCheckBoxOption USE_KAISER_WINDOW; diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp index a47e919dfa..648079702c 100644 --- a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp +++ b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp @@ -118,6 +118,12 @@ GlobalSettings::GlobalSettings() LockMode::UNLOCK_WHILE_RUNNING, false ) + , CONSOLE_SETTINGS_COLLAPSED( + "Start with console settings collapsed:
" + "Each program's \"Console N Settings\" box starts folded up. Click its title to open it.", + LockMode::UNLOCK_WHILE_RUNNING, + false + ) , KEYBOARD_CONTROLS_LAYOUT( CONSTRUCT_TOKEN, "System Keyboard Layout:
" @@ -203,6 +209,7 @@ GlobalSettings::GlobalSettings() PA_ADD_OPTION(WINDOW_SIZE); PA_ADD_OPTION(LOG_WINDOW_SIZE); PA_ADD_OPTION(LOG_WINDOW_STARTUP); + PA_ADD_OPTION(CONSOLE_SETTINGS_COLLAPSED); PA_ADD_OPTION(KEYBOARD_CONTROLS_LAYOUT); PA_ADD_OPTION(STREAM_HISTORY); diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.h b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.h index 6983e04de6..dfcae9dbec 100644 --- a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.h +++ b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.h @@ -91,6 +91,7 @@ class GlobalSettings : public BatchOption, private ConfigOption::Listener, priva Pimpl WINDOW_SIZE; Pimpl LOG_WINDOW_SIZE; BooleanCheckBoxOption LOG_WINDOW_STARTUP; + BooleanCheckBoxOption CONSOLE_SETTINGS_COLLAPSED; Pimpl KEYBOARD_CONTROLS_LAYOUT; diff --git a/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp b/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp index ec02dd74e1..f8d434fc65 100644 --- a/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp +++ b/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp @@ -8,6 +8,7 @@ #include #include "CommandRowWidget.h" #include "ConsoleSystemWidget.h" +#include "CommonFramework/GlobalSettingsPanel.h" namespace PokemonAutomation{ @@ -37,7 +38,10 @@ ConsoleSystemWidget::ConsoleSystemWidget( layout->setContentsMargins(0, 0, 0, 0); layout->setAlignment(Qt::AlignTop); - m_group_box = new CollapsibleGroupBox(*this, "Console " + QString::number(m_session.console_number()) + " Settings"); + m_group_box = new CollapsibleGroupBox( + *this, "Console " + QString::number(m_session.console_number()) + " Settings", + !GlobalSettings::instance().CONSOLE_SETTINGS_COLLAPSED + ); layout->addWidget(m_group_box); {