Simplify state handling in QCamera and QMediaRecorder

Remove the loaded/unloaded states. Instead simply have
a boolean indicating whether the camera is active.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameravideorenderercontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameravideorenderercontrol.cpp
index 6c4f36914..47fac4e63 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameravideorenderercontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameravideorenderercontrol.cpp
@@ -151,12 +151,12 @@ void QAndroidCameraDataVideoOutput::configureFormat()
     } else {
         m_control->cameraSession()->setPreviewCallback(this);
 
-        if (m_control->cameraSession()->status() > QCamera::LoadedStatus)
+        if (m_control->cameraSession()->status() > QCamera::InactiveStatus)
             m_control->cameraSession()->camera()->stopPreview();
 
         m_control->cameraSession()->setPreviewFormat(qt_androidImageFormatFromPixelFormat(m_pixelFormat));
 
-        if (m_control->cameraSession()->status() > QCamera::LoadedStatus)
+        if (m_control->cameraSession()->status() > QCamera::InactiveStatus)
             m_control->cameraSession()->camera()->startPreview();
     }
 }