Fix Mac build. Move the stream history settings.

Author: Mysticial

SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp

@@ -59,22 +59,26 @@ StreamHistoryOption::StreamHistoryOption()
         IS_BETA_VERSION
     )
     , DESCRIPTION(
-        "Keep a record of this many seconds of video+audio. This will allow "
-        "video capture for unexpected events.<br>"
-        "<font color=\"orange\">Warning: The current implementation is inefficient "
-        "and may write a lot of data to disk. "
-        "This feature is still a work-in-progress."
+        "Keep a record of the recent video+audio streams. This will allow video capture "
+        "for unexpected events.<br><br>"
+        "<font color=\"orange\">Warning: This feature is computationally expensive and "
+        "will require a more powerful computer to run (especially for multi-Switch programs).<br>"
+        "Furthermore, the current implementation is inefficient as it will write a lot "
+        "of data to disk. This feature is still a work-in-progress."
         "</font>"
     )
-    , VIDEO_HISTORY_SECONDS(
-        "<b>Video History (seconds):</b><br>"
-        "Keep this many seconds of video feed for video capture and debugging purposes.",
+    , HISTORY_SECONDS(
+        "<b>History (seconds):</b><br>"
+        "Keep this many seconds of video and audio feed for video capture and debugging purposes.<br><br>"
+        "<font color=\"orange\">Do not set this too large as it will consume a lot of memory and may exceed the "
+        "attachment size limit for Discord notifications."
+        "</font>",
         LockMode::UNLOCK_WHILE_RUNNING,
         30
     )
 {
     PA_ADD_STATIC(DESCRIPTION);
-    PA_ADD_OPTION(VIDEO_HISTORY_SECONDS);
+    PA_ADD_OPTION(HISTORY_SECONDS);
 }
 
 
@@ -265,6 +269,11 @@ GlobalSettings::GlobalSettings()
     PA_ADD_OPTION(ALL_STATS);
     PA_ADD_OPTION(WINDOW_SIZE);
     PA_ADD_OPTION(THEME);
+#if (QT_VERSION_MAJOR == 6) && (QT_VERSION_MINOR >= 8)
+    PA_ADD_OPTION(STREAM_HISTORY);
+#else
+    STREAM_HISTORY.set_enabled(false);
+#endif
 #ifdef PA_ENABLE_SLEEP_SUPPRESS
     PA_ADD_OPTION(SLEEP_SUPPRESS);
 #endif
@@ -292,11 +301,6 @@ GlobalSettings::GlobalSettings()
 #if QT_VERSION_MAJOR == 5
     PA_ADD_OPTION(ENABLE_FRAME_SCREENSHOTS);
 #endif
-#if (QT_VERSION_MAJOR == 6) && (QT_VERSION_MINOR >= 8)
-    PA_ADD_OPTION(STREAM_HISTORY);
-#else
-    STREAM_HISTORY.set_enabled(false);
-#endif
 
     PA_ADD_OPTION(AUTO_RESET_AUDIO_SECONDS);
     PA_ADD_OPTION(AUTO_RESET_VIDEO_SECONDS);

SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.h

@@ -53,7 +53,7 @@ class StreamHistoryOption : public GroupOption{
     StreamHistoryOption();
 
     StaticTextOption DESCRIPTION;
-    SimpleIntegerOption<uint16_t> VIDEO_HISTORY_SECONDS;
+    SimpleIntegerOption<uint16_t> HISTORY_SECONDS;
 };
 
 
@@ -95,6 +95,7 @@ class GlobalSettings : public BatchOption, private ConfigOption::Listener{
     ResolutionOption WINDOW_SIZE;
     ThemeSelectorOption THEME;
 
+    StreamHistoryOption STREAM_HISTORY;
     SleepSuppressOptions SLEEP_SUPPRESS;
 
     SectionDividerOption m_discord_settings;
@@ -122,8 +123,6 @@ class GlobalSettings : public BatchOption, private ConfigOption::Listener{
 #if QT_VERSION_MAJOR == 5
     BooleanCheckBoxOption ENABLE_FRAME_SCREENSHOTS;
 #endif
-//    SimpleIntegerOption<uint16_t> VIDEO_HISTORY_SECONDS;
-    StreamHistoryOption STREAM_HISTORY;
 
     SimpleIntegerOption<uint8_t> AUTO_RESET_AUDIO_SECONDS;
     SimpleIntegerOption<uint8_t> AUTO_RESET_VIDEO_SECONDS;

SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp

@@ -38,7 +38,7 @@ struct StreamHistorySession::Data{
 
     Data(Logger& logger)
         : m_logger(logger)
-        , m_window(GlobalSettings::instance().STREAM_HISTORY.VIDEO_HISTORY_SECONDS)
+        , m_window(GlobalSettings::instance().STREAM_HISTORY.HISTORY_SECONDS)
         , m_audio_format(AudioChannelFormat::NONE)
     {}
 };
@@ -62,9 +62,8 @@ void StreamHistorySession::start(AudioChannelFormat format){
 
 class HistorySaverThread : public QThread{
 public:
-    HistorySaverThread(Logger& logger, StreamHistoryTracker& tracker, const std::string& filename)
-        : m_logger(logger)
-        , m_tracker(tracker)
+    HistorySaverThread(StreamHistoryTracker& tracker, const std::string& filename)
+        : m_tracker(tracker)
         , m_filename(filename)
     {
     }
@@ -84,7 +83,6 @@ class HistorySaverThread : public QThread{
     }
 
 private:
-    Logger& m_logger;
     StreamHistoryTracker& m_tracker;
     const std::string& m_filename;
     bool m_success = false;
@@ -107,7 +105,7 @@ bool StreamHistorySession::save(const std::string& filename) const{
     }
 
 //    tracker->save(m_logger, filename);
-    HistorySaverThread saver(data.m_logger, *tracker, filename);
+    HistorySaverThread saver(*tracker, filename);
     return saver.save();
 }
 void StreamHistorySession::on_samples(const float* samples, size_t frames){

SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp

@@ -116,7 +116,7 @@ CameraSession::CameraSession(Logger& logger, Resolution default_resolution)
     , m_last_frame_seqnum(0)
     , m_last_image_timestamp(WallClock::min())
     , m_stats_conversion("ConvertFrame", "ms", 1000, std::chrono::seconds(10))
-//    , m_history(GlobalSettings::instance().VIDEO_HISTORY_SECONDS * 1000000)
+//    , m_history(GlobalSettings::instance().HISTORY_SECONDS * 1000000)
 {
     uint8_t watchdog_timeout = GlobalSettings::instance().AUTO_RESET_VIDEO_SECONDS;
     if (watchdog_timeout != 0){