From 9b461edd0c0eaad31114c3b13b83a08a59543077 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Mon, 17 Mar 2025 23:18:25 +0100
Subject: Rephrase merge audio button

---
 include/gui/SettingsPage.hpp |  4 ++--
 src/gui/SettingsPage.cpp     | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/include/gui/SettingsPage.hpp b/include/gui/SettingsPage.hpp
index 69ecc5a..b9f5cde 100644
--- a/include/gui/SettingsPage.hpp
+++ b/include/gui/SettingsPage.hpp
@@ -64,7 +64,7 @@ namespace gsr {
         std::unique_ptr<Button> create_add_custom_application_audio_button();
         std::unique_ptr<List> create_add_audio_buttons();
         std::unique_ptr<List> create_audio_track_track_section();
-        std::unique_ptr<CheckBox> create_merge_audio_tracks_checkbox();
+        std::unique_ptr<CheckBox> create_split_audio_checkbox();
         std::unique_ptr<CheckBox> create_application_audio_invert_checkbox();
         std::unique_ptr<Widget> create_audio_track_section();
         std::unique_ptr<Widget> create_audio_section();
@@ -155,7 +155,7 @@ namespace gsr {
         List *audio_track_list_ptr = nullptr;
         Button *add_application_audio_button_ptr = nullptr;
         Button *add_custom_application_audio_button_ptr = nullptr;
-        CheckBox *merge_audio_tracks_checkbox_ptr = nullptr;
+        CheckBox *split_audio_checkbox_ptr = nullptr;
         CheckBox *application_audio_invert_checkbox_ptr = nullptr;
         CheckBox *change_video_resolution_checkbox_ptr = nullptr;
         ComboBox *color_range_box_ptr = nullptr;
diff --git a/src/gui/SettingsPage.cpp b/src/gui/SettingsPage.cpp
index f29f4af..be09f54 100644
--- a/src/gui/SettingsPage.cpp
+++ b/src/gui/SettingsPage.cpp
@@ -286,11 +286,11 @@ namespace gsr {
         return list;
     }
 
-    std::unique_ptr<CheckBox> SettingsPage::create_merge_audio_tracks_checkbox() {
-        auto merge_audio_tracks_checkbox = std::make_unique<CheckBox>(&get_theme().body_font, "Merge audio tracks");
-        merge_audio_tracks_checkbox->set_checked(true);
-        merge_audio_tracks_checkbox_ptr = merge_audio_tracks_checkbox.get();
-        return merge_audio_tracks_checkbox;
+    std::unique_ptr<CheckBox> SettingsPage::create_split_audio_checkbox() {
+        auto split_audio_checkbox = std::make_unique<CheckBox>(&get_theme().body_font, "Split each device/app audio into separate audio tracks");
+        split_audio_checkbox->set_checked(false);
+        split_audio_checkbox_ptr = split_audio_checkbox.get();
+        return split_audio_checkbox;
     }
 
     std::unique_ptr<CheckBox> SettingsPage::create_application_audio_invert_checkbox() {
@@ -311,7 +311,7 @@ namespace gsr {
         auto audio_device_section_list = std::make_unique<List>(List::Orientation::VERTICAL);
         audio_device_section_list->add_widget(create_audio_track_section());
         if(type != Type::STREAM)
-            audio_device_section_list->add_widget(create_merge_audio_tracks_checkbox());
+            audio_device_section_list->add_widget(create_split_audio_checkbox());
         audio_device_section_list->add_widget(create_application_audio_invert_checkbox());
         audio_device_section_list->add_widget(create_audio_codec());
         return std::make_unique<Subsection>("Audio", std::move(audio_device_section_list), mgl::vec2f(settings_scrollable_page_ptr->get_inner_size().x, 0.0f));
@@ -760,6 +760,7 @@ namespace gsr {
             video_codec_ptr->set_visible(advanced_view);
             framerate_mode_list_ptr->set_visible(advanced_view);
             notifications_subsection_ptr->set_visible(advanced_view);
+            split_audio_checkbox_ptr->set_visible(advanced_view);
             settings_scrollable_page_ptr->reset_scroll();
             return true;
         };
@@ -833,6 +834,7 @@ namespace gsr {
             video_codec_ptr->set_visible(advanced_view);
             framerate_mode_list_ptr->set_visible(advanced_view);
             notifications_subsection_ptr->set_visible(advanced_view);
+            split_audio_checkbox_ptr->set_visible(advanced_view);
             settings_scrollable_page_ptr->reset_scroll();
             return true;
         };
@@ -1043,8 +1045,8 @@ namespace gsr {
 
     void SettingsPage::load_common(RecordOptions &record_options) {
         record_area_box_ptr->set_selected_item(record_options.record_area_option);
-        if(merge_audio_tracks_checkbox_ptr)
-            merge_audio_tracks_checkbox_ptr->set_checked(record_options.merge_audio_tracks);
+        if(split_audio_checkbox_ptr)
+            split_audio_checkbox_ptr->set_checked(!record_options.merge_audio_tracks);
         application_audio_invert_checkbox_ptr->set_checked(record_options.application_audio_invert);
         change_video_resolution_checkbox_ptr->set_checked(record_options.change_video_resolution);
         load_audio_tracks(record_options);
@@ -1169,8 +1171,8 @@ namespace gsr {
         record_options.video_height = atoi(video_height_entry_ptr->get_text().c_str());
         record_options.fps = atoi(framerate_entry_ptr->get_text().c_str());
         record_options.video_bitrate = atoi(video_bitrate_entry_ptr->get_text().c_str());
-        if(merge_audio_tracks_checkbox_ptr)
-            record_options.merge_audio_tracks = merge_audio_tracks_checkbox_ptr->is_checked();
+        if(split_audio_checkbox_ptr)
+            record_options.merge_audio_tracks = !split_audio_checkbox_ptr->is_checked();
         record_options.application_audio_invert = application_audio_invert_checkbox_ptr->is_checked();
         record_options.change_video_resolution = change_video_resolution_checkbox_ptr->is_checked();
         save_audio_tracks(record_options.audio_tracks, audio_track_list_ptr);
-- 
cgit v1.2.3-70-g09d2