diff options
Diffstat (limited to 'src/multimedia/platform/qnx')
6 files changed, 11 insertions, 11 deletions
diff --git a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp index 506544d74..5a78e1ee0 100644 --- a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp +++ b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE BbCameraImageCaptureControl::BbCameraImageCaptureControl(BbCameraSession *session, QObject *parent) - : QPlatformCameraImageCapture(parent) + : QPlatformImageCapture(parent) , m_session(session) { connect(m_session, SIGNAL(readyForCaptureChanged(bool)), this, SIGNAL(readyForCaptureChanged(bool))); diff --git a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h index 7a25cc0e3..62ba19c97 100644 --- a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h +++ b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h @@ -50,13 +50,13 @@ // We mean it. // -#include <private/qplatformcameraimagecapture_p.h> +#include <private/qplatformimagecapture_p.h> QT_BEGIN_NAMESPACE class BbCameraSession; -class BbCameraImageCaptureControl : public QPlatformCameraImageCapture +class BbCameraImageCaptureControl : public QPlatformImageCapture { Q_OBJECT public: diff --git a/src/multimedia/platform/qnx/camera/bbcameraservice.cpp b/src/multimedia/platform/qnx/camera/bbcameraservice.cpp index f116fea01..6f68e68ed 100644 --- a/src/multimedia/platform/qnx/camera/bbcameraservice.cpp +++ b/src/multimedia/platform/qnx/camera/bbcameraservice.cpp @@ -78,7 +78,7 @@ QPlatformCamera *BbCameraService::camera() return m_cameraControl; } -QPlatformCameraImageCapture *BbCameraService::imageCapture() +QPlatformImageCapture *BbCameraService::imageCapture() { return m_cameraImageCaptureControl; } diff --git a/src/multimedia/platform/qnx/camera/bbcameraservice_p.h b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h index 0f7f95b09..128fc1154 100644 --- a/src/multimedia/platform/qnx/camera/bbcameraservice_p.h +++ b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h @@ -76,7 +76,7 @@ public: ~BbCameraService(); QPlatformCamera *camera() override; - QPlatformCameraImageCapture *imageCapture() override; + QPlatformImageCapture *imageCapture() override; QPlatformMediaEncoder *mediaEncoder() override; void setVideoPreview(QVideoSink *surface) override; diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp index 3f31960e5..9ce740d20 100644 --- a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp +++ b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp @@ -317,7 +317,7 @@ static void imageCaptureImageCallback(camera_handle_t handle, camera_buffer_t *b // We are inside a worker thread here, so emit error signal inside the main thread QMetaObject::invokeMethod(data->session, "imageCaptureError", Qt::QueuedConnection, Q_ARG(int, data->requestId), - Q_ARG(QCameraImageCapture::Error, QCameraImageCapture::FormatError), + Q_ARG(QImageCapture::Error, QImageCapture::FormatError), Q_ARG(QString, BbCameraSession::tr("Camera provides image in unsupported format"))); return; } @@ -331,7 +331,7 @@ static void imageCaptureImageCallback(camera_handle_t handle, camera_buffer_t *b // We are inside a worker thread here, so emit error signal inside the main thread QMetaObject::invokeMethod(data->session, "imageCaptureError", Qt::QueuedConnection, Q_ARG(int, data->requestId), - Q_ARG(QCameraImageCapture::Error, QCameraImageCapture::FormatError), + Q_ARG(QImageCapture::Error, QImageCapture::FormatError), Q_ARG(QString, errorMessage)); return; } @@ -349,7 +349,7 @@ int BbCameraSession::capture(const QString &fileName) m_lastImageCaptureId++; if (!isReadyForCapture()) { - emit imageCaptureError(m_lastImageCaptureId, QCameraImageCapture::NotReadyError, tr("Camera not ready")); + emit imageCaptureError(m_lastImageCaptureId, QImageCapture::NotReadyError, tr("Camera not ready")); return m_lastImageCaptureId; } @@ -631,11 +631,11 @@ void BbCameraSession::imageCaptured(int requestId, const QImage &rawImage, const if (image.save(&file, "JPG")) { emit imageSaved(requestId, actualFileName); } else { - emit imageCaptureError(requestId, QCameraImageCapture::OutOfSpaceError, file.errorString()); + emit imageCaptureError(requestId, QImageCapture::OutOfSpaceError, file.errorString()); } } else { const QString errorMessage = tr("Could not open destination file:\n%1").arg(actualFileName); - emit imageCaptureError(requestId, QCameraImageCapture::ResourceError, errorMessage); + emit imageCaptureError(requestId, QImageCapture::ResourceError, errorMessage); } } } diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession_p.h b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h index 4743eff40..b45a0e876 100644 --- a/src/multimedia/platform/qnx/camera/bbcamerasession_p.h +++ b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h @@ -53,7 +53,7 @@ #include "bbmediastoragelocation_p.h" #include <QCamera> -#include <QCameraImageCapture> +#include <QImageCapture> #include <QElapsedTimer> #include <QMediaRecorder> #include <QMutex> |