Use new volume conversion API in examples.

Volumes sliders are now scaled cubically so that loudness changes
are perceived linearly.

Change-Id: Ibf00d6a97d872063d92457493417be5eb42f79ac
Reviewed-by: Christian Stromme <christian.stromme@qt.io>

1 files changed, 11 insertions, 3 deletions

diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index fd73d4f16..da5966598 100644
--- a/examples/multimedia/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
@@ -315,7 +315,10 @@ void InputTest::initializeAudio()
 void InputTest::createAudioInput()
 {
     m_audioInput = new QAudioInput(m_device, m_format, this);
-    m_volumeSlider->setValue(m_audioInput->volume() * 100);
+    qreal initialVolume = QAudio::convertVolume(m_audioInput->volume(),
+                                                QAudio::LinearVolumeScale,
+                                                QAudio::CubicVolumeScale);
+    m_volumeSlider->setValue(qRound(initialVolume * 100));
     m_audioInfo->start();
     m_audioInput->start(m_audioInfo);
 }
@@ -386,6 +389,11 @@ void InputTest::deviceChanged(int index)
 
 void InputTest::sliderChanged(int value)
 {
-    if (m_audioInput)
-        m_audioInput->setVolume(qreal(value) / 100);
+    if (m_audioInput) {
+        qreal linearVolume =  QAudio::convertVolume(value / qreal(100),
+                                                    QAudio::CubicVolumeScale,
+                                                    QAudio::LinearVolumeScale);
+
+        m_audioInput->setVolume(linearVolume);
+    }
 }