frontend: Refactor and update Audio Mixer

Author: Warchamp7

frontend/OBSApp.cpp

@@ -362,7 +362,7 @@ void OBSApp::InitUserConfigDefaults()
 	config_set_default_bool(userConfig, "BasicWindow", "ShowContextToolbars", true);
 	config_set_default_bool(userConfig, "BasicWindow", "StudioModeLabels", true);
 
-	config_set_default_bool(userConfig, "BasicWindow", "VerticalVolControl", false);
+	config_set_default_bool(userConfig, "BasicWindow", "VerticalVolumeControl", false);
 
 	config_set_default_bool(userConfig, "BasicWindow", "MultiviewMouseSwitch", true);
 
@@ -372,6 +372,11 @@ void OBSApp::InitUserConfigDefaults()
 
 	config_set_default_bool(userConfig, "BasicWindow", "MediaControlsCountdownTimer", true);
 
+	config_set_default_bool(App()->GetUserConfig(), "BasicWindow", "MixerShowInactive", false);
+	config_set_default_bool(App()->GetUserConfig(), "BasicWindow", "MixerKeepInactiveLast", false);
+	config_set_default_bool(App()->GetUserConfig(), "BasicWindow", "MixerShowHidden", false);
+	config_set_default_bool(App()->GetUserConfig(), "BasicWindow", "MixerKeepHiddenLast", false);
+
 	config_set_default_int(userConfig, "Appearance", "FontScale", 10);
 	config_set_default_int(userConfig, "Appearance", "Density", 1);
 }

frontend/cmake/ui-components.cmake

@@ -79,6 +79,14 @@ target_sources(
     components/VisibilityItemDelegate.hpp
     components/VisibilityItemWidget.cpp
     components/VisibilityItemWidget.hpp
+    components/VolumeAccessibleInterface.cpp
+    components/VolumeAccessibleInterface.hpp
+    components/VolumeControl.cpp
+    components/VolumeControl.hpp
+    components/VolumeMeter.cpp
+    components/VolumeMeter.hpp
+    components/VolumeName.cpp
+    components/VolumeName.hpp
     components/VolumeSlider.cpp
     components/VolumeSlider.hpp
     components/WindowCaptureToolbar.cpp

frontend/cmake/ui-utility.cmake

@@ -57,8 +57,6 @@ target_sources(
     utility/StartMultiTrackVideoStreamingGuard.hpp
     utility/SurfaceEventFilter.hpp
     utility/VCamConfig.hpp
-    utility/VolumeMeterTimer.cpp
-    utility/VolumeMeterTimer.hpp
     utility/audio-encoders.cpp
     utility/audio-encoders.hpp
     utility/display-helpers.hpp

frontend/cmake/ui-widgets.cmake

@@ -10,6 +10,8 @@ target_link_libraries(obs-studio PRIVATE OBS::qt-vertical-scroll-area)
 target_sources(
   obs-studio
   PRIVATE
+    widgets/AudioMixer.cpp
+    widgets/AudioMixer.hpp
     widgets/ColorSelect.cpp
     widgets/ColorSelect.hpp
     widgets/OBSBasic.cpp
@@ -41,7 +43,6 @@ target_sources(
     widgets/OBSBasic_Transitions.cpp
     widgets/OBSBasic_Updater.cpp
     widgets/OBSBasic_VirtualCam.cpp
-    widgets/OBSBasic_VolControl.cpp
     widgets/OBSBasic_YouTube.cpp
     widgets/OBSBasicControls.cpp
     widgets/OBSBasicControls.hpp
@@ -58,10 +59,4 @@ target_sources(
     widgets/OBSQTDisplay.hpp
     widgets/StatusBarWidget.cpp
     widgets/StatusBarWidget.hpp
-    widgets/VolControl.cpp
-    widgets/VolControl.hpp
-    widgets/VolumeAccessibleInterface.cpp
-    widgets/VolumeAccessibleInterface.hpp
-    widgets/VolumeMeter.cpp
-    widgets/VolumeMeter.hpp
 )

frontend/components/MenuCheckBox.cpp

@@ -18,6 +18,9 @@
 #include "MenuCheckBox.hpp"
 
 #include <QMenu>
+#include <QMouseEvent>
+#include <QStyleOptionButton>
+#include <QStylePainter>
 
 MenuCheckBox::MenuCheckBox(const QString &text, QWidget *parent) : QCheckBox(text, parent)
 {

frontend/components/MenuCheckBox.hpp

@@ -18,9 +18,10 @@
 #pragma once
 
 #include <QCheckBox>
-#include <QStyleOptionButton>
-#include <QStylePainter>
-#include <QMouseEvent>
+
+class QStyleOptionButton;
+class QStylePainter;
+class QMouseEvent;
 
 class MenuCheckBox : public QCheckBox {
 	Q_OBJECT

frontend/components/OBSSourceLabel.cpp

@@ -18,28 +18,43 @@
 #include "OBSSourceLabel.hpp"
 #include "moc_OBSSourceLabel.cpp"
 
-void OBSSourceLabel::SourceRenamed(void *data, calldata_t *params)
+OBSSourceLabel::OBSSourceLabel(const obs_source_t *source, QWidget *parent, Qt::WindowFlags f)
+	: QLabel(obs_source_get_name(source), parent, f),
+	  renamedSignal(obs_source_get_signal_handler(source), "rename", &OBSSourceLabel::obsSourceRenamed, this),
+	  removedSignal(obs_source_get_signal_handler(source), "remove", &OBSSourceLabel::obsSourceRemoved, this),
+	  destroyedSignal(obs_source_get_signal_handler(source), "destroy", &OBSSourceLabel::obsSourceDestroyed, this)
+{
+}
+
+void OBSSourceLabel::obsSourceRenamed(void *data, calldata_t *params)
 {
 	auto &label = *static_cast<OBSSourceLabel *>(data);
 
 	const char *name = calldata_string(params, "new_name");
 	label.setText(name);
 
-	emit label.Renamed(name);
+	emit label.renamed(name);
 }
 
-void OBSSourceLabel::SourceRemoved(void *data, calldata_t *)
+void OBSSourceLabel::obsSourceRemoved(void *data, calldata_t *)
 {
 	auto &label = *static_cast<OBSSourceLabel *>(data);
-	emit label.Removed();
+	emit label.removed();
 }
 
-void OBSSourceLabel::SourceDestroyed(void *data, calldata_t *)
+void OBSSourceLabel::obsSourceDestroyed(void *data, calldata_t *)
 {
 	auto &label = *static_cast<OBSSourceLabel *>(data);
-	emit label.Destroyed();
+	emit label.destroyed();
 
 	label.destroyedSignal.Disconnect();
 	label.removedSignal.Disconnect();
 	label.renamedSignal.Disconnect();
 }
+
+void OBSSourceLabel::mousePressEvent(QMouseEvent *event)
+{
+	emit clicked();
+
+	QLabel::mousePressEvent(event);
+}

frontend/components/OBSSourceLabel.hpp

@@ -29,22 +29,17 @@ class OBSSourceLabel : public QLabel {
 	OBSSignal removedSignal;
 	OBSSignal destroyedSignal;
 
-	OBSSourceLabel(const obs_source_t *source, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags())
-		: QLabel(obs_source_get_name(source), parent, f),
-		  renamedSignal(obs_source_get_signal_handler(source), "rename", &OBSSourceLabel::SourceRenamed, this),
-		  removedSignal(obs_source_get_signal_handler(source), "remove", &OBSSourceLabel::SourceRemoved, this),
-		  destroyedSignal(obs_source_get_signal_handler(source), "destroy", &OBSSourceLabel::SourceDestroyed,
-				  this)
-	{
-	}
+	OBSSourceLabel(const obs_source_t *source, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
 
 protected:
-	static void SourceRenamed(void *data, calldata_t *params);
-	static void SourceRemoved(void *data, calldata_t *params);
-	static void SourceDestroyed(void *data, calldata_t *params);
+	static void obsSourceRenamed(void *data, calldata_t *params);
+	static void obsSourceRemoved(void *data, calldata_t *params);
+	static void obsSourceDestroyed(void *data, calldata_t *params);
+	void mousePressEvent(QMouseEvent *event);
 
 signals:
-	void Renamed(const char *name);
-	void Removed();
-	void Destroyed();
+	void renamed(const char *name);
+	void removed();
+	void destroyed();
+	void clicked();
 };