From ad929984e3560407cd530d4420bda97e973d5e7d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20Str=C3=B8mme?= Date: Fri, 31 Oct 2014 13:47:19 +0100 Subject: [PATCH] OpenSL ES: Don't store or return the adjusted volume level. According to our own docs we should always return 1.0 (MAX) volume level if the device doesn't support setting the volume, which is the case for OpenSL ES on Android. Task-number: QTBUG-42159 Change-Id: I9144e9e2cd84cc80633c68c5d6fa32b8dbd0fcd5 Reviewed-by: Yoann Lopes --- src/plugins/opensles/qopenslesaudioinput.cpp | 5 ++--- src/plugins/opensles/qopenslesaudioinput.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/opensles/qopenslesaudioinput.cpp b/src/plugins/opensles/qopenslesaudioinput.cpp index cd592a7..181649a 100644 --- a/src/plugins/opensles/qopenslesaudioinput.cpp +++ b/src/plugins/opensles/qopenslesaudioinput.cpp @@ -70,7 +70,6 @@ QOpenSLESAudioInput::QOpenSLESAudioInput(const QByteArray &device) , m_errorState(QAudio::NoError) , m_deviceState(QAudio::StoppedState) , m_lastNotifyTime(0) - , m_volume(1) , m_bufferSize(0) , m_periodSize(0) , m_intervalTime(1000) @@ -480,12 +479,12 @@ qint64 QOpenSLESAudioInput::elapsedUSecs() const void QOpenSLESAudioInput::setVolume(qreal vol) { // Volume interface is not available for the recorder on Android - m_volume = vol; + Q_UNUSED(vol); } qreal QOpenSLESAudioInput::volume() const { - return m_volume; + return qreal(1.0); } void QOpenSLESAudioInput::reset() diff --git a/src/plugins/opensles/qopenslesaudioinput.h b/src/plugins/opensles/qopenslesaudioinput.h index 7ffff04..481ff37 100644 --- a/src/plugins/opensles/qopenslesaudioinput.h +++ b/src/plugins/opensles/qopenslesaudioinput.h @@ -113,7 +113,6 @@ private: QAudio::State m_deviceState; QTime m_clockStamp; qint64 m_lastNotifyTime; - qreal m_volume; int m_bufferSize; int m_periodSize; int m_intervalTime; -- 2.7.4