From bcd97c3a60498bb55bb0f8adfa2df6e9a05d6c4d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 5 Oct 2019 23:25:00 +0200 Subject: [PATCH] Ref T731, correct UI audio messages --- src/blackcore/context/contextaudio.cpp | 2 +- src/blackgui/components/audiodevicevolumesetupcomponent.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/blackcore/context/contextaudio.cpp b/src/blackcore/context/contextaudio.cpp index 81d5dc035..3901ee743 100644 --- a/src/blackcore/context/contextaudio.cpp +++ b/src/blackcore/context/contextaudio.cpp @@ -105,7 +105,7 @@ namespace BlackCore QString IContextAudio::audioRunsWhereInfo() const { - static const QString s = QStringLiteral("Local audio on '%1', '%2'.").arg(audioRunsWhere().getMachineName(), audioRunsWhere().getProcessName()); + static const QString s = QStringLiteral("Audio on '%1', '%2'.").arg(audioRunsWhere().getMachineName(), audioRunsWhere().getProcessName()); return s; } diff --git a/src/blackgui/components/audiodevicevolumesetupcomponent.cpp b/src/blackgui/components/audiodevicevolumesetupcomponent.cpp index d14fe51bf..d3151f760 100644 --- a/src/blackgui/components/audiodevicevolumesetupcomponent.cpp +++ b/src/blackgui/components/audiodevicevolumesetupcomponent.cpp @@ -94,7 +94,9 @@ namespace BlackGui if (audio) { - ui->le_Info->setText(audio ? sGui->getIContextAudio()->audioRunsWhereInfo() : "No audio, cannot change."); + const QString ai = audio ? sGui->getIContextAudio()->audioRunsWhereInfo() : "No audio, cannot change."; + ui->le_Info->setText(ai); + ui->le_Info->setPlaceholderText(ai); this->initAudioDeviceLists(); @@ -130,7 +132,7 @@ namespace BlackGui int CAudioDeviceVolumeSetupComponent::getInValue(int from, int to) const { - const double r = ui->hs_VolumeIn->maximum() - ui->hs_VolumeIn->minimum(); + const double r = ui->hs_VolumeIn->maximum() - ui->hs_VolumeIn->minimum(); const double tr = to - from; return qRound(ui->hs_VolumeIn->value() / r * tr); }