opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: Use vector for volume control signals

Browse Source 
This cleans up the volume control code by using a vector for
signals.
This commit is contained in:
cg2121
2024-05-11 18:18:13 -07:00
committed by tt2468
parent cd918a7f4c
commit 272a5edbaa
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/volume-control.cpp
+8 -16
View File
@@ -379,14 +379,13 @@ VolControl::VolControl(OBSSource source_, bool showConfig, bool vertical)
obs_fader_add_callback(obs_fader, OBSVolumeChanged, this);
obs_volmeter_add_callback(obs_volmeter, OBSVolumeLevel, this);
signal_handler_connect(obs_source_get_signal_handler(source), "mute",
OBSVolumeMuted, this);
signal_handler_connect(obs_source_get_signal_handler(source),
"audio_mixers", OBSMixersOrMonitoringChanged,
this);
signal_handler_connect(obs_source_get_signal_handler(source),
"audio_monitoring", OBSMixersOrMonitoringChanged,
this);
sigs.emplace_back(obs_source_get_signal_handler(source), "mute",
OBSVolumeMuted, this);
sigs.emplace_back(obs_source_get_signal_handler(source), "audio_mixers",
OBSMixersOrMonitoringChanged, this);
sigs.emplace_back(obs_source_get_signal_handler(source),
"audio_monitoring", OBSMixersOrMonitoringChanged,
this);
QWidget::connect(slider, &VolumeSlider::valueChanged, this,
&VolControl::SliderChanged);
@@ -422,14 +421,7 @@ VolControl::~VolControl()
obs_fader_remove_callback(obs_fader, OBSVolumeChanged, this);
obs_volmeter_remove_callback(obs_volmeter, OBSVolumeLevel, this);
signal_handler_disconnect(obs_source_get_signal_handler(source), "mute",
OBSVolumeMuted, this);
signal_handler_disconnect(obs_source_get_signal_handler(source),
"audio_mixers", OBSMixersOrMonitoringChanged,
this);
signal_handler_disconnect(obs_source_get_signal_handler(source),
"audio_monitoring",
OBSMixersOrMonitoringChanged, this);
sigs.clear();
if (contextMenu)
contextMenu->close();
UI/volume-control.hpp
+1
View File
@@ -278,6 +278,7 @@ class VolControl : public QWidget {
private:
OBSSource source;
std::vector<OBSSignal> sigs;
QLabel *nameLabel;
QLabel *volLabel;
VolumeMeter *volMeter;