UI: Use OBSSourceLabel for VolControl

The OBSSourceLabel handles renaming of a source, so we don't have to use the rename signals for volume controls.
obsproject · May 12, 2024 · b82a49e · b82a49e
1 parent 272a5ed
commit b82a49e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git a/UI/volume-control.cpp b/UI/volume-control.cpp
@@ -5,6 +5,7 @@
 #include "mute-checkbox.hpp"
 #include "slider-ignorewheel.hpp"
 #include "slider-absoluteset-style.hpp"
+#include "source-label.hpp"
 #include <QFontDatabase>
 #include <QHBoxLayout>
 #include <QPushButton>
@@ -219,16 +220,6 @@ void VolControl::updateText()
 	slider->setAccessibleName(accText);
 }
 
-QString VolControl::GetName() const
-{
-	return nameLabel->text();
-}
-
-void VolControl::SetName(const QString &newName)
-{
-	nameLabel->setText(newName);
-}
-
 void VolControl::EmitConfigClicked()
 {
 	emit ConfigClicked();
@@ -253,7 +244,7 @@ VolControl::VolControl(OBSSource source_, bool showConfig, bool vertical)
 	  vertical(vertical),
 	  contextMenu(nullptr)
 {
-	nameLabel = new QLabel();
+	nameLabel = new OBSSourceLabel(source);
 	volLabel = new QLabel();
 	mute = new MuteCheckBox();
 

diff --git a/UI/volume-control.hpp b/UI/volume-control.hpp
@@ -272,14 +272,15 @@ class VolumeMeterTimer : public QTimer {
 class QLabel;
 class QSlider;
 class MuteCheckBox;
+class OBSSourceLabel;
 
 class VolControl : public QWidget {
 	Q_OBJECT
 
 private:
 	OBSSource source;
 	std::vector<OBSSignal> sigs;
-	QLabel *nameLabel;
+	OBSSourceLabel *nameLabel;
 	QLabel *volLabel;
 	VolumeMeter *volMeter;
 	QSlider *slider;
@@ -321,9 +322,6 @@ private slots:
 
 	inline obs_source_t *GetSource() const { return source; }
 
-	QString GetName() const;
-	void SetName(const QString &newName);
-
 	void SetMeterDecayRate(qreal q);
 	void setPeakMeterType(enum obs_peak_meter_type peakMeterType);
 

diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
@@ -3339,11 +3339,6 @@ void OBSBasic::RenameSources(OBSSource source, QString newName,
 {
 	RenameListValues(ui->scenes, newName, prevName);
 
-	for (size_t i = 0; i < volumes.size(); i++) {
-		if (volumes[i]->GetName().compare(prevName) == 0)
-			volumes[i]->SetName(newName);
-	}
-
 	if (vcamConfig.type == VCamOutputType::SourceOutput &&
 	    prevName == QString::fromStdString(vcamConfig.source))
 		vcamConfig.source = newName.toStdString();