summaryrefslogtreecommitdiffstats
path: root/src/plugins/multimedia/qnx/capture/qqnxmediacapturesession.cpp
diff options
context:
space:
mode:
authorRafael Roquetto <rafael.roquetto@qt.io>2022-06-09 13:58:12 +1000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-09 09:14:36 +0000
commit8c498c1728295e88cdce62a2fe236e11632ed7aa (patch)
tree5ef8ca656738a5df319bb1a9ab3f381223d66e29 /src/plugins/multimedia/qnx/capture/qqnxmediacapturesession.cpp
parentf32c1764ad89c2cc6d6c6fe31f7e2d2e7d2dfe32 (diff)
Refactor QNX camera support
Introduce a brand new QQnxCamera class that models around the QNX camera API, and represents an underlying camera unit. As a result, QQnxCamera is a self-contained and orthogonal class that no longer inherits from QPlatformCamera. A new class called QQnxPlatformCamera has been introduced to provide the QPlatformCamera implementation for QNX. While QQnxCamera remains close to the underlying QNX camera API (including the types being used), QQnxPlatformCamera sits one level up and makes use of a QQnxCamera object to expose it to the Qt-compliant API/types. QQnxCamera also enabled doing without the code duplication in QQnxVideoDevices, vastly simplified that class. Change-Id: I5e09a24d52f4890616c66373dd4529c404b107b2 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit e881a1afc08f1b168e743d63a2acc3025f3cb88c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins/multimedia/qnx/capture/qqnxmediacapturesession.cpp')
-rw-r--r--src/plugins/multimedia/qnx/capture/qqnxmediacapturesession.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/multimedia/qnx/capture/qqnxmediacapturesession.cpp b/src/plugins/multimedia/qnx/capture/qqnxmediacapturesession.cpp
index c38dcfd80..99ca0ab8b 100644
--- a/src/plugins/multimedia/qnx/capture/qqnxmediacapturesession.cpp
+++ b/src/plugins/multimedia/qnx/capture/qqnxmediacapturesession.cpp
@@ -39,7 +39,7 @@
#include "qqnxmediacapturesession_p.h"
#include "qqnxaudioinput_p.h"
-#include "qqnxcamera_p.h"
+#include "qqnxplatformcamera_p.h"
#include "qqnximagecapture_p.h"
#include "qqnxmediarecorder_p.h"
#include "qqnxvideosink_p.h"
@@ -65,7 +65,8 @@ void QQnxMediaCaptureSession::setCamera(QPlatformCamera *camera)
{
if (camera == m_camera)
return;
- m_camera = static_cast<QQnxCamera *>(camera);
+ m_camera = static_cast<QQnxPlatformCamera *>(camera);
+ m_camera->setCaptureSession(this);
emit cameraChanged();
}