2222namespace {
2323
2424const QString kAppGroup = QStringLiteral(" [App]" );
25- const QString kMasterGroup = QStringLiteral(" [Master ]" );
25+ const QString kMixerGroup = QStringLiteral(" [Mixer ]" );
2626const ConfigKey kKeylockEngingeCfgkey =
2727 ConfigKey (kAppGroup , QStringLiteral(" keylock_engine" ));
2828const ConfigKey kKeylockMultiThreadingCfgkey =
@@ -74,11 +74,11 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent,
7474 m_pSoundManager(pSoundManager),
7575 m_pSettings(pSettings),
7676 m_config(pSoundManager.get()),
77- m_pLatencyCompensation(kMasterGroup , QStringLiteral(" microphoneLatencyCompensation " )),
78- m_pMainDelay(kMasterGroup , QStringLiteral(" delay " )),
79- m_pHeadDelay(kMasterGroup , QStringLiteral(" headDelay " )),
80- m_pBoothDelay(kMasterGroup , QStringLiteral(" boothDelay " )),
81- m_pMicMonitorMode(kMasterGroup , QStringLiteral(" talkover_mix" )),
77+ m_pLatencyCompensation(kMixerGroup , QStringLiteral(" microphone_delay " )),
78+ m_pMainDelay(kMixerGroup , QStringLiteral(" main_delay " )),
79+ m_pHeadDelay(kMixerGroup , QStringLiteral(" headphone_delay " )),
80+ m_pBoothDelay(kMixerGroup , QStringLiteral(" booth_delay " )),
81+ m_pMicMonitorMode(kMixerGroup , QStringLiteral(" talkover_mix" )),
8282 m_pKeylockEngine(kKeylockEngingeCfgkey ),
8383 m_settingsModified(false ),
8484 m_bLatencyChanged(false ),
@@ -266,7 +266,7 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent,
266266 // TODO: remove this option by automatically disabling/enabling the main mix
267267 // when recording, broadcasting, headphone, and main outputs are enabled/disabled
268268 m_pMainEnabled =
269- make_parented<ControlProxy>(kMasterGroup , QStringLiteral (" enabled " ), this );
269+ make_parented<ControlProxy>(kMixerGroup , QStringLiteral (" main_enabled " ), this );
270270 mainMixComboBox->addItem (tr (" Disabled" ));
271271 mainMixComboBox->addItem (tr (" Enabled" ));
272272 mainMixComboBox->setCurrentIndex (m_pMainEnabled->toBool () ? 1 : 0 );
@@ -277,7 +277,7 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent,
277277 m_pMainEnabled->connectValueChanged (this , &DlgPrefSound::mainEnabledChanged);
278278
279279 m_pMainMonoMixdown =
280- make_parented<ControlProxy>(kMasterGroup , QStringLiteral (" mono_mixdown" ), this );
280+ make_parented<ControlProxy>(kMixerGroup , QStringLiteral (" mono_mixdown" ), this );
281281 mainOutputModeComboBox->addItem (tr (" Stereo" ));
282282 mainOutputModeComboBox->addItem (tr (" Mono" ));
283283 mainOutputModeComboBox->setCurrentIndex (m_pMainMonoMixdown->toBool () ? 1 : 0 );
0 commit comments