Skip to content

Commit

Permalink
FIX(client,positional-audio): Prevent min distance >= max distance
Browse files Browse the repository at this point in the history
This kind of setup seems nonsensical and is therefore prevented by
automatically adapting the other threshold accordingly.
  • Loading branch information
Krzmbrzl committed May 13, 2023
1 parent 6516fd0 commit 8d7e1b5
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/mumble/AudioConfigDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -856,20 +856,32 @@ void AudioOutputDialog::on_qcbLoopback_currentIndexChanged(int v) {
void AudioOutputDialog::on_qsMinDistance_valueChanged(int value) {
QSignalBlocker blocker(qsbMinimumDistance);
qsbMinimumDistance->setValue(value / 10.0f);

// Ensure that max distance is always a least 1m larger than min distance
qsbMaximumDistance->setValue(std::max(qsbMaximumDistance->value(), (value / 10.0) + 1));
}

void AudioOutputDialog::on_qsbMinimumDistance_valueChanged(double value) {
QSignalBlocker blocker(qsMinDistance);
qsMinDistance->setValue(value * 10);

// Ensure that max distance is always a least 1m larger than min distance
qsMaxDistance->setValue(std::max(qsMaxDistance->value(), static_cast< int >(value * 10) + 1));
}

void AudioOutputDialog::on_qsMaxDistance_valueChanged(int value) {
QSignalBlocker blocker(qsbMaximumDistance);
qsbMaximumDistance->setValue(value / 10.0f);

// Ensure that max distance is always a least 1m larger than min distance
qsbMinimumDistance->setValue(std::min(qsbMinimumDistance->value(), (value / 10.0) - 1));
}
void AudioOutputDialog::on_qsbMaximumDistance_valueChanged(double value) {
QSignalBlocker blocker(qsMaxDistance);
qsMaxDistance->setValue(value * 10);

// Ensure that max distance is always a least 1m larger than min distance
qsMinDistance->setValue(std::min(qsMinDistance->value(), static_cast< int >(value * 10) - 1));
}

void AudioOutputDialog::on_qsMinimumVolume_valueChanged(int value) {
Expand Down

0 comments on commit 8d7e1b5

Please sign in to comment.