Merge QPlatformCameraImageProcessing into QPlatformCamera

Clean up the API while wer're at it, and rename
manualWhiteBalance to colorTemperature.

Simplify the backend API now that we only have white
balance and color temperature in there.

Change-Id: Ied8702b0c68a8fbea08d314d96c0261049db5b4d
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@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 2177e6c5f..ae5c79dec 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 "qwindowscameraimageprocessing_p.h"
 #include "qwindowsmultimediautils_p.h"
 #include <qvideosink.h>
 #include <QtCore/qdebug.h>
@@ -51,7 +50,6 @@ QWindowsCameraSession::QWindowsCameraSession(QObject *parent)
     : QObject(parent)
 {
     m_cameraReader = new QWindowsCameraReader(this);
-    m_cameraImageProcessing = new QWindowsCameraImageProcessing(this);
     connect(m_cameraReader, SIGNAL(streamingStarted()), this, SLOT(handleStreamingStarted()));
     connect(m_cameraReader, SIGNAL(streamingStopped()), this, SLOT(handleStreamingStopped()));
     connect(m_cameraReader, SIGNAL(recordingStarted()), this, SIGNAL(recordingStarted()));
@@ -61,7 +59,6 @@ QWindowsCameraSession::QWindowsCameraSession(QObject *parent)
 
 QWindowsCameraSession::~QWindowsCameraSession()
 {
-    delete m_cameraImageProcessing;
     delete m_cameraReader;
 }
 
@@ -124,11 +121,6 @@ void QWindowsCameraSession::setVideoSink(QVideoSink *surface)
     m_cameraReader->setSurface(surface);
 }
 
-QWindowsCameraImageProcessing *QWindowsCameraSession::imageProcessingControl()
-{
-    return m_cameraImageProcessing;
-}
-
 void QWindowsCameraSession::handleStreamingStarted()
 {
     m_active = true;