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); {