Move the audio input settings from the encoder to the capture session

This is closer to where those settings should be. They certainly
don't belong into the media encoder.

Change-Id: I45801ee7c875600719052b6ae41e1ea5c04e4389
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 6 insertions, 4 deletions

diff --git a/src/imports/multimedia/qdeclarativecamerarecorder.cpp b/src/imports/multimedia/qdeclarativecamerarecorder.cpp
index 8044230a1..b61d97177 100644
--- a/src/imports/multimedia/qdeclarativecamerarecorder.cpp
+++ b/src/imports/multimedia/qdeclarativecamerarecorder.cpp
@@ -75,8 +75,9 @@ QT_BEGIN_NAMESPACE
     \sa QAudioEncoderSettings, QVideoEncoderSettings
 */
 
-QDeclarativeCameraRecorder::QDeclarativeCameraRecorder(QMediaCaptureSession *session, QObject *parent) :
-    QObject(parent)
+QDeclarativeCameraRecorder::QDeclarativeCameraRecorder(QMediaCaptureSession *session, QObject *parent)
+    : QObject(parent),
+    m_captureSession(session)
 {
     m_encoder = new QMediaEncoder(this);
     session->setEncoder(m_encoder);
@@ -551,12 +552,12 @@ qint64 QDeclarativeCameraRecorder::duration() const
 */
 bool QDeclarativeCameraRecorder::isMuted() const
 {
-    return m_encoder->isMuted();
+    return m_captureSession->isMuted();
 }
 
 void QDeclarativeCameraRecorder::setMuted(bool muted)
 {
-    m_encoder->setMuted(muted);
+    m_captureSession->setMuted(muted);
 }
 
 /*!
diff --git a/src/imports/multimedia/qdeclarativecamerarecorder_p.h b/src/imports/multimedia/qdeclarativecamerarecorder_p.h
index 4ea3f9a2f..a2444ca1d 100644
--- a/src/imports/multimedia/qdeclarativecamerarecorder_p.h
+++ b/src/imports/multimedia/qdeclarativecamerarecorder_p.h
@@ -211,6 +211,7 @@ private:
     friend class QDeclarativeCamera;
     QDeclarativeCameraRecorder(QMediaCaptureSession *session, QObject *parent = 0);
 
+    QMediaCaptureSession *m_captureSession = nullptr;
     QMediaEncoder *m_encoder = nullptr;
     QDeclarativeMediaMetaData *m_metaData = nullptr;