Add more video quality settings. Add restore defaults button to GroupOption. Refactor GroupOption configuration.

Author: Mysticial

Common/Cpp/Options/GroupOption.cpp

@@ -20,19 +20,19 @@ namespace PokemonAutomation{
 
 struct GroupOption::Data{
     const std::string m_label;
-    const bool m_toggleable;
-    const bool m_default_enabled;
+    const EnableMode m_enable_mode;
+    const bool m_show_restore_defaults_button;
+
     std::atomic<bool> m_enabled;
 
     Data(
         std::string label,
-        bool toggleable,
-        bool enabled
+        EnableMode enable_mode,
+        bool show_restore_defaults_button
     )
         : m_label(std::move(label))
-        , m_toggleable(toggleable)
-        , m_default_enabled(enabled)
-        , m_enabled(enabled)
+        , m_enable_mode(enable_mode)
+        , m_show_restore_defaults_button(show_restore_defaults_button)
     {}
 };
 
@@ -41,18 +41,18 @@ GroupOption::~GroupOption() = default;
 GroupOption::GroupOption(
     std::string label,
     LockMode lock_while_program_is_running,
-    bool toggleable,
-    bool enabled
+    EnableMode enable_mode,
+    bool show_restore_defaults_button
 )
     : BatchOption(lock_while_program_is_running)
-    , m_data(CONSTRUCT_TOKEN, std::move(label), toggleable, enabled)
+    , m_data(CONSTRUCT_TOKEN, std::move(label), enable_mode, show_restore_defaults_button)
 {}
 
 const std::string GroupOption::label() const{
     return m_data->m_label;
 }
 bool GroupOption::toggleable() const{
-    return m_data->m_toggleable;
+    return m_data->m_enable_mode != EnableMode::ALWAYS_ENABLED;
 }
 bool GroupOption::enabled() const{
     return m_data->m_enabled.load(std::memory_order_relaxed);
@@ -63,13 +63,17 @@ void GroupOption::set_enabled(bool enabled){
         on_set_enabled(enabled);
     }
 }
+bool GroupOption::restore_defaults_button_enabled() const{
+    return m_data->m_show_restore_defaults_button;
+}
+
 void GroupOption::load_json(const JsonValue& json){
     BatchOption::load_json(json);
     const JsonObject* obj = json.to_object();
     if (obj == nullptr){
         return;
     }
-    if (m_data->m_toggleable){
+    if (toggleable()){
         bool enabled;
         if (obj->read_boolean(enabled, "Enabled")){
             if (enabled != m_data->m_enabled.exchange(enabled, std::memory_order_relaxed)){
@@ -81,17 +85,19 @@ void GroupOption::load_json(const JsonValue& json){
 }
 JsonValue GroupOption::to_json() const{
     JsonObject obj = std::move(*BatchOption::to_json().to_object());
-    if (m_data->m_toggleable){
+    if (toggleable()){
         obj["Enabled"] = m_data->m_enabled.load(std::memory_order_relaxed);
     }
     return obj;
 }
 void GroupOption::restore_defaults(){
     BatchOption::restore_defaults();
-    bool default_value = m_data->m_default_enabled;
-    if (default_value != m_data->m_enabled.exchange(default_value, std::memory_order_relaxed)){
-        report_value_changed(this);
-        on_set_enabled(default_value);
+    if (toggleable()){
+        bool default_value = m_data->m_enable_mode == EnableMode::DEFAULT_ENABLED;
+        if (default_value != m_data->m_enabled.exchange(default_value, std::memory_order_relaxed)){
+            report_value_changed(this);
+            on_set_enabled(default_value);
+        }
     }
 }
 void GroupOption::on_set_enabled(bool enabled){}

Common/Cpp/Options/GroupOption.h

@@ -15,19 +15,28 @@ namespace PokemonAutomation{
 
 class GroupOption : public BatchOption{
 public:
+    enum class EnableMode{
+        ALWAYS_ENABLED,
+        DEFAULT_DISABLED,
+        DEFAULT_ENABLED,
+    };
+
     ~GroupOption();
     GroupOption(
         std::string label,
         LockMode lock_while_program_is_running,
-        bool toggleable = false,
-        bool enabled = true
+        EnableMode enable_mode = EnableMode::ALWAYS_ENABLED,
+        bool show_restore_defaults_button = false
     );
 
     const std::string label() const;
+
     bool toggleable() const;
     bool enabled() const;
     void set_enabled(bool enabled);
 
+    bool restore_defaults_button_enabled() const;
+
     virtual void load_json(const JsonValue& json) override;
     virtual JsonValue to_json() const override;
 

Common/Qt/Options/GroupWidget.cpp

@@ -6,7 +6,9 @@
 
 #include <QVBoxLayout>
 #include <QLabel>
+#include <QPushButton>
 #include <QGroupBox>
+#include <QMessageBox>
 //#include "Common/Compiler.h"
 #include "GroupWidget.h"
 
@@ -30,6 +32,7 @@ GroupWidget::GroupWidget(QWidget& parent, GroupOption& value)
     : QWidget(&parent)
     , ConfigWidget(value, *this)
     , m_value(value)
+    , m_restore_defaults_button(nullptr)
 {
     QVBoxLayout* layout = new QVBoxLayout(this);
 //    layout->setAlignment(Qt::AlignTop);
@@ -73,6 +76,26 @@ GroupWidget::GroupWidget(QWidget& parent, GroupOption& value)
         m_options_layout->addWidget(&m_options.back()->widget());
     }
 
+    if (value.restore_defaults_button_enabled()){
+        m_options.back()->widget().setContentsMargins(5, 5, 5, 5);
+        m_restore_defaults_button = new QPushButton("Restore Defaults", this);
+        m_options_layout->addWidget(m_restore_defaults_button);
+        connect(
+            m_restore_defaults_button, &QPushButton::clicked,
+            this, [this](bool on){
+                QMessageBox::StandardButton button = QMessageBox::question(
+                    nullptr,
+                    "Restore Defaults",
+                    "Are you sure you wish to restore this section back to defaults?",
+                    QMessageBox::Ok | QMessageBox::Cancel
+                );
+                if (button == QMessageBox::Ok){
+                    m_value.restore_defaults();
+                }
+            }
+        );
+    }
+
     connect(
         m_group_box, &QGroupBox::toggled,
         this, [this](bool on){

Common/Qt/Options/GroupWidget.h

@@ -13,6 +13,7 @@
 
 class QVBoxLayout;
 class QGroupBox;
+class QPushButton;
 
 namespace PokemonAutomation{
 
@@ -37,6 +38,7 @@ class GroupWidget : public QWidget, public ConfigWidget{
     QWidget* m_expand_text;
     QWidget* m_options_holder;
     std::vector<ConfigWidget*> m_options;
+    QPushButton* m_restore_defaults_button;
     bool m_expanded = true;
     QVBoxLayout* m_options_layout;
 };

SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp

@@ -35,7 +35,11 @@ const std::string& ERROR_PATH_SENT = "ErrorReportsSent";
 
 
 ErrorReportOption::ErrorReportOption()
-    : GroupOption("Error Reports", LockMode::UNLOCK_WHILE_RUNNING, false)
+    : GroupOption(
+        "Error Reports",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::ALWAYS_ENABLED, true
+    )
     , DESCRIPTION(
         "Send error reports to the " + PROGRAM_NAME + " server to help them resolve issues and improve the program."
     )

SerialPrograms/Source/CommonFramework/Notifications/EventNotificationsTable.cpp

@@ -40,7 +40,11 @@ std::vector<std::string> EventNotificationsTable::make_header() const{
 
 
 EventNotificationsOption::EventNotificationsOption(std::vector<EventNotificationOption*> options)
-    : GroupOption("Discord Notifications", LockMode::UNLOCK_WHILE_RUNNING, true)
+    : GroupOption(
+        "Discord Notifications",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::DEFAULT_ENABLED, false
+    )
     , m_table(std::move(options))
 {
     PA_ADD_OPTION(m_table);

SerialPrograms/Source/CommonFramework/Options/Environment/SleepSuppressOption.cpp

@@ -33,7 +33,7 @@ SleepSuppressOptions::SleepSuppressOptions()
     : GroupOption(
         "Suppress Screensaver/Sleep:",
         LockMode::UNLOCK_WHILE_RUNNING,
-        false, true
+        GroupOption::EnableMode::ALWAYS_ENABLED, true
     )
     , IDLE("No Program Running:", SleepSuppress::NONE)
 #ifdef PA_ENABLE_SLEEP_SUPPRESS_NO_SLEEP

SerialPrograms/Source/CommonFramework/Recording/StreamHistoryOption.cpp

@@ -9,13 +9,14 @@
 
 namespace PokemonAutomation{
 
-
 StreamHistoryOption::StreamHistoryOption()
     : GroupOption(
         "Stream History",
         LockMode::LOCK_WHILE_RUNNING,
-        true,
         IS_BETA_VERSION
+            ? GroupOption::EnableMode::DEFAULT_ENABLED
+            : GroupOption::EnableMode::DEFAULT_DISABLED,
+        true
     )
     , DESCRIPTION(
         "Keep a record of the recent video+audio streams. This will allow video capture "
@@ -35,10 +36,44 @@ StreamHistoryOption::StreamHistoryOption()
         LockMode::UNLOCK_WHILE_RUNNING,
         30
     )
+    , RESOLUTION(
+        "<b>Resolution:</b>",
+        {
+            {Resolution::MATCH_INPUT,   "match",    "Match Input Resolution"},
+            {Resolution::FORCE_720p,    "720p",     "1280 x 720"},
+            {Resolution::FORCE_1080p,   "1080p",    "1920 x 1080"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        Resolution::MATCH_INPUT
+    )
+    , ENCODING_MODE(
+        "<b>Encoding Mode:</b>",
+        {
+            {EncodingMode::FIXED_QUALITY, "fixed-quality", "Fixed Quality"},
+            {EncodingMode::FIXED_BITRATE, "fixed-bitrate", "Fixed Bit Rate"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        EncodingMode::FIXED_QUALITY
+    )
+    , VIDEO_QUALITY(
+        "<b>Video Quality:</b><br>"
+        "<font color=\"orange\">High quality videos will take more disk space "
+        "and may exceed the attachment size limit for Discord notifications."
+        "</font>",
+        {
+            {VideoQuality::VERY_LOW,    "very-low",     "Very Low"},
+            {VideoQuality::LOW,         "low",          "Low"},
+            {VideoQuality::NORMAL,      "normal",       "Normal"},
+            {VideoQuality::HIGH,        "high",         "High"},
+            {VideoQuality::VERY_HIGH,   "very-high",    "Very High"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        VideoQuality::LOW
+    )
     , VIDEO_BITRATE(
         "<b>Video Bit-Rate (kbps):</b><br>"
         "Lower = lower quality, smaller file size.<br>"
-        "Higher = high quality, larger file size.<br><br>"
+        "Higher = high quality, larger file size.<br>"
         "<font color=\"orange\">Large values can exceed the attachment size limit for Discord notifications."
         "</font>",
         LockMode::UNLOCK_WHILE_RUNNING,
@@ -47,9 +82,35 @@ StreamHistoryOption::StreamHistoryOption()
 {
     PA_ADD_STATIC(DESCRIPTION);
     PA_ADD_OPTION(HISTORY_SECONDS);
+    PA_ADD_OPTION(RESOLUTION);
+    PA_ADD_OPTION(ENCODING_MODE);
+    PA_ADD_OPTION(VIDEO_QUALITY);
     PA_ADD_OPTION(VIDEO_BITRATE);
+
+    value_changed(this);
+
+    ENCODING_MODE.add_listener(*this);
+}
+StreamHistoryOption::~StreamHistoryOption(){
+    ENCODING_MODE.remove_listener(*this);
+}
+
+void StreamHistoryOption::value_changed(void* object){
+    switch (ENCODING_MODE){
+    case EncodingMode::FIXED_QUALITY:
+        VIDEO_QUALITY.set_visibility(ConfigOptionState::ENABLED);
+        VIDEO_BITRATE.set_visibility(ConfigOptionState::HIDDEN);
+        break;
+    case EncodingMode::FIXED_BITRATE:
+        VIDEO_QUALITY.set_visibility(ConfigOptionState::HIDDEN);
+        VIDEO_BITRATE.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    }
 }
 
 
 
+
+
+
 }

SerialPrograms/Source/CommonFramework/Recording/StreamHistoryOption.h

@@ -9,18 +9,45 @@
 
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "Common/Cpp/Options/GroupOption.h"
 
 namespace PokemonAutomation{
 
 
 
-class StreamHistoryOption : public GroupOption{
+class StreamHistoryOption : public GroupOption, public ConfigOption::Listener{
 public:
     StreamHistoryOption();
+    ~StreamHistoryOption();
+
+    virtual void value_changed(void* object) override;
 
     StaticTextOption DESCRIPTION;
     SimpleIntegerOption<uint16_t> HISTORY_SECONDS;
+
+    enum class Resolution{
+        MATCH_INPUT,
+        FORCE_720p,
+        FORCE_1080p,
+    };
+    EnumDropdownOption<Resolution> RESOLUTION;
+
+    enum class EncodingMode{
+        FIXED_QUALITY,
+        FIXED_BITRATE,
+    };
+    EnumDropdownOption<EncodingMode> ENCODING_MODE;
+
+
+    enum class VideoQuality{
+        VERY_LOW,
+        LOW,
+        NORMAL,
+        HIGH,
+        VERY_HIGH,
+    };
+    EnumDropdownOption<VideoQuality> VIDEO_QUALITY;
     SimpleIntegerOption<uint32_t> VIDEO_BITRATE;
 };