diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/multimedia/audioinput/audioinput.cpp | 4 | ||||
| -rw-r--r-- | examples/multimedia/audiooutput/audiooutput.cpp | 4 | ||||
| -rw-r--r-- | examples/multimediawidgets/player/playercontrols.cpp | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp index da5966598..cdf56af99 100644 --- a/examples/multimedia/audioinput/audioinput.cpp +++ b/examples/multimedia/audioinput/audioinput.cpp @@ -317,7 +317,7 @@ void InputTest::createAudioInput() m_audioInput = new QAudioInput(m_device, m_format, this); qreal initialVolume = QAudio::convertVolume(m_audioInput->volume(), QAudio::LinearVolumeScale, - QAudio::CubicVolumeScale); + QAudio::LogarithmicVolumeScale); m_volumeSlider->setValue(qRound(initialVolume * 100)); m_audioInfo->start(); m_audioInput->start(m_audioInfo); @@ -391,7 +391,7 @@ void InputTest::sliderChanged(int value) { if (m_audioInput) { qreal linearVolume = QAudio::convertVolume(value / qreal(100), - QAudio::CubicVolumeScale, + QAudio::LogarithmicVolumeScale, QAudio::LinearVolumeScale); m_audioInput->setVolume(linearVolume); diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index 79e70bdc2..3e9ec7377 100644 --- a/examples/multimedia/audiooutput/audiooutput.cpp +++ b/examples/multimedia/audiooutput/audiooutput.cpp @@ -253,7 +253,7 @@ void AudioTest::createAudioOutput() qreal initialVolume = QAudio::convertVolume(m_audioOutput->volume(), QAudio::LinearVolumeScale, - QAudio::CubicVolumeScale); + QAudio::LogarithmicVolumeScale); m_volumeSlider->setValue(qRound(initialVolume * 100)); } @@ -276,7 +276,7 @@ void AudioTest::volumeChanged(int value) { if (m_audioOutput) { qreal linearVolume = QAudio::convertVolume(value / qreal(100), - QAudio::CubicVolumeScale, + QAudio::LogarithmicVolumeScale, QAudio::LinearVolumeScale); m_audioOutput->setVolume(linearVolume); diff --git a/examples/multimediawidgets/player/playercontrols.cpp b/examples/multimediawidgets/player/playercontrols.cpp index 80abf59b6..3d968b452 100644 --- a/examples/multimediawidgets/player/playercontrols.cpp +++ b/examples/multimediawidgets/player/playercontrols.cpp @@ -140,7 +140,7 @@ void PlayerControls::setState(QMediaPlayer::State state) int PlayerControls::volume() const { qreal linearVolume = QAudio::convertVolume(volumeSlider->value() / qreal(100), - QAudio::CubicVolumeScale, + QAudio::LogarithmicVolumeScale, QAudio::LinearVolumeScale); return qRound(linearVolume * 100); @@ -148,11 +148,11 @@ int PlayerControls::volume() const void PlayerControls::setVolume(int volume) { - qreal cubicVolume = QAudio::convertVolume(volume / qreal(100), - QAudio::LinearVolumeScale, - QAudio::CubicVolumeScale); + qreal logarithmicVolume = QAudio::convertVolume(volume / qreal(100), + QAudio::LinearVolumeScale, + QAudio::LogarithmicVolumeScale); - volumeSlider->setValue(qRound(cubicVolume * 100)); + volumeSlider->setValue(qRound(logarithmicVolume * 100)); } bool PlayerControls::isMuted() const |