mirror of
https://github.com/obsproject/obs-studio.git
synced 2026-05-12 17:35:49 -04:00
clang-format: Increase column limit from 80 to 120
This commit is contained in:
@@ -9,22 +9,17 @@
|
||||
|
||||
Q_DECLARE_METATYPE(OBSSource);
|
||||
|
||||
OBSBasicAdvAudio::OBSBasicAdvAudio(QWidget *parent)
|
||||
: QDialog(parent),
|
||||
ui(new Ui::OBSAdvAudio),
|
||||
showInactive(false)
|
||||
OBSBasicAdvAudio::OBSBasicAdvAudio(QWidget *parent) : QDialog(parent), ui(new Ui::OBSAdvAudio), showInactive(false)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
signal_handler_t *sh = obs_get_signal_handler();
|
||||
sigs.emplace_back(sh, "source_audio_activate", OBSSourceAdded, this);
|
||||
sigs.emplace_back(sh, "source_audio_deactivate", OBSSourceRemoved,
|
||||
this);
|
||||
sigs.emplace_back(sh, "source_audio_deactivate", OBSSourceRemoved, this);
|
||||
sigs.emplace_back(sh, "source_activate", OBSSourceActivated, this);
|
||||
sigs.emplace_back(sh, "source_deactivate", OBSSourceRemoved, this);
|
||||
|
||||
VolumeType volType = (VolumeType)config_get_int(
|
||||
App()->GetUserConfig(), "BasicWindow", "AdvAudioVolumeType");
|
||||
VolumeType volType = (VolumeType)config_get_int(App()->GetUserConfig(), "BasicWindow", "AdvAudioVolumeType");
|
||||
|
||||
if (volType == VolumeType::Percent)
|
||||
ui->usePercent->setChecked(true);
|
||||
@@ -54,8 +49,7 @@ bool OBSBasicAdvAudio::EnumSources(void *param, obs_source_t *source)
|
||||
uint32_t flags = obs_source_get_output_flags(source);
|
||||
|
||||
if ((flags & OBS_SOURCE_AUDIO) != 0 &&
|
||||
(dialog->showInactive ||
|
||||
(obs_source_active(source) && obs_source_audio_active(source))))
|
||||
(dialog->showInactive || (obs_source_active(source) && obs_source_audio_active(source))))
|
||||
dialog->AddAudioSource(source);
|
||||
|
||||
return true;
|
||||
@@ -65,16 +59,15 @@ void OBSBasicAdvAudio::OBSSourceAdded(void *param, calldata_t *calldata)
|
||||
{
|
||||
OBSSource source((obs_source_t *)calldata_ptr(calldata, "source"));
|
||||
|
||||
QMetaObject::invokeMethod(reinterpret_cast<OBSBasicAdvAudio *>(param),
|
||||
"SourceAdded", Q_ARG(OBSSource, source));
|
||||
QMetaObject::invokeMethod(reinterpret_cast<OBSBasicAdvAudio *>(param), "SourceAdded", Q_ARG(OBSSource, source));
|
||||
}
|
||||
|
||||
void OBSBasicAdvAudio::OBSSourceRemoved(void *param, calldata_t *calldata)
|
||||
{
|
||||
OBSSource source((obs_source_t *)calldata_ptr(calldata, "source"));
|
||||
|
||||
QMetaObject::invokeMethod(reinterpret_cast<OBSBasicAdvAudio *>(param),
|
||||
"SourceRemoved", Q_ARG(OBSSource, source));
|
||||
QMetaObject::invokeMethod(reinterpret_cast<OBSBasicAdvAudio *>(param), "SourceRemoved",
|
||||
Q_ARG(OBSSource, source));
|
||||
}
|
||||
|
||||
void OBSBasicAdvAudio::OBSSourceActivated(void *param, calldata_t *calldata)
|
||||
@@ -82,9 +75,8 @@ void OBSBasicAdvAudio::OBSSourceActivated(void *param, calldata_t *calldata)
|
||||
OBSSource source((obs_source_t *)calldata_ptr(calldata, "source"));
|
||||
|
||||
if (obs_source_audio_active(source))
|
||||
QMetaObject::invokeMethod(
|
||||
reinterpret_cast<OBSBasicAdvAudio *>(param),
|
||||
"SourceAdded", Q_ARG(OBSSource, source));
|
||||
QMetaObject::invokeMethod(reinterpret_cast<OBSBasicAdvAudio *>(param), "SourceAdded",
|
||||
Q_ARG(OBSSource, source));
|
||||
}
|
||||
|
||||
inline void OBSBasicAdvAudio::AddAudioSource(obs_source_t *source)
|
||||
@@ -140,8 +132,7 @@ void OBSBasicAdvAudio::on_usePercent_toggled(bool checked)
|
||||
for (size_t i = 0; i < controls.size(); i++)
|
||||
controls[i]->SetVolumeWidget(type);
|
||||
|
||||
config_set_int(App()->GetUserConfig(), "BasicWindow",
|
||||
"AdvAudioVolumeType", (int)type);
|
||||
config_set_int(App()->GetUserConfig(), "BasicWindow", "AdvAudioVolumeType", (int)type);
|
||||
}
|
||||
|
||||
void OBSBasicAdvAudio::on_activeOnly_toggled(bool checked)
|
||||
@@ -167,19 +158,14 @@ void OBSBasicAdvAudio::SetShowInactive(bool show)
|
||||
|
||||
SetIconsVisible(showVisible);
|
||||
} else {
|
||||
sigs.emplace_back(sh, "source_audio_activate", OBSSourceAdded,
|
||||
this);
|
||||
sigs.emplace_back(sh, "source_audio_deactivate",
|
||||
OBSSourceRemoved, this);
|
||||
sigs.emplace_back(sh, "source_activate", OBSSourceActivated,
|
||||
this);
|
||||
sigs.emplace_back(sh, "source_deactivate", OBSSourceRemoved,
|
||||
this);
|
||||
sigs.emplace_back(sh, "source_audio_activate", OBSSourceAdded, this);
|
||||
sigs.emplace_back(sh, "source_audio_deactivate", OBSSourceRemoved, this);
|
||||
sigs.emplace_back(sh, "source_activate", OBSSourceActivated, this);
|
||||
sigs.emplace_back(sh, "source_deactivate", OBSSourceRemoved, this);
|
||||
|
||||
for (size_t i = 0; i < controls.size(); i++) {
|
||||
const auto source = controls[i]->GetSource();
|
||||
if (!(obs_source_active(source) &&
|
||||
obs_source_audio_active(source))) {
|
||||
if (!(obs_source_active(source) && obs_source_audio_active(source))) {
|
||||
delete controls[i];
|
||||
controls.erase(controls.begin() + i);
|
||||
i--;
|
||||
|
||||
Reference in New Issue
Block a user