Move QPlatformCameraExposure API into QPlatformCamera

Clean up the internal API while we're at it and get rid of the
multiplexing API. Instead have virtual methods for each
property.

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

1 files changed, 0 insertions, 8 deletions

diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp
index 87f8742a9..2177e6c5f 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp
+++ b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp
@@ -40,7 +40,6 @@
 #include "qwindowscamerasession_p.h"
 
 #include "qwindowscamerareader_p.h"
-#include "qwindowscameraexposure_p.h"
 #include "qwindowscameraimageprocessing_p.h"
 #include "qwindowsmultimediautils_p.h"
 #include <qvideosink.h>
@@ -52,7 +51,6 @@ QWindowsCameraSession::QWindowsCameraSession(QObject *parent)
     : QObject(parent)
 {
     m_cameraReader = new QWindowsCameraReader(this);
-    m_cameraExposure = new QWindowsCameraExposure(this);
     m_cameraImageProcessing = new QWindowsCameraImageProcessing(this);
     connect(m_cameraReader, SIGNAL(streamingStarted()), this, SLOT(handleStreamingStarted()));
     connect(m_cameraReader, SIGNAL(streamingStopped()), this, SLOT(handleStreamingStopped()));
@@ -64,7 +62,6 @@ QWindowsCameraSession::QWindowsCameraSession(QObject *parent)
 QWindowsCameraSession::~QWindowsCameraSession()
 {
     delete m_cameraImageProcessing;
-    delete m_cameraExposure;
     delete m_cameraReader;
 }
 
@@ -127,11 +124,6 @@ void QWindowsCameraSession::setVideoSink(QVideoSink *surface)
     m_cameraReader->setSurface(surface);
 }
 
-QWindowsCameraExposure *QWindowsCameraSession::exposureControl()
-{
-    return m_cameraExposure;
-}
-
 QWindowsCameraImageProcessing *QWindowsCameraSession::imageProcessingControl()
 {
     return m_cameraImageProcessing;