diff options
Diffstat (limited to 'src/multimedia/camera')
-rw-r--r-- | src/multimedia/camera/qcamera.cpp | 58 | ||||
-rw-r--r-- | src/multimedia/camera/qcamera_p.h | 24 | ||||
-rw-r--r-- | src/multimedia/camera/qcameraexposure.cpp | 6 | ||||
-rw-r--r-- | src/multimedia/camera/qcamerafocus.cpp | 6 | ||||
-rw-r--r-- | src/multimedia/camera/qcameraimagecapture.cpp | 34 | ||||
-rw-r--r-- | src/multimedia/camera/qcameraimageprocessing.cpp | 2 |
6 files changed, 69 insertions, 61 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index c7d64155c..46c6af9ff 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -206,12 +206,12 @@ void QCameraPrivate::initControls() error = QCamera::NoError; } else { - control = 0; - locksControl = 0; - deviceControl = 0; - infoControl = 0; - viewfinderSettingsControl = 0; - viewfinderSettingsControl2 = 0; + control = nullptr; + locksControl = nullptr; + deviceControl = nullptr; + infoControl = nullptr; + viewfinderSettingsControl = nullptr; + viewfinderSettingsControl2 = nullptr; error = QCamera::ServiceMissingError; errorString = QCamera::tr("The camera service is missing"); @@ -241,16 +241,16 @@ void QCameraPrivate::clear() provider->releaseService(service); } - cameraExposure = 0; - cameraFocus = 0; - imageProcessing = 0; - control = 0; - locksControl = 0; - deviceControl = 0; - infoControl = 0; - viewfinderSettingsControl = 0; - viewfinderSettingsControl2 = 0; - service = 0; + cameraExposure = nullptr; + cameraFocus = nullptr; + imageProcessing = nullptr; + control = nullptr; + locksControl = nullptr; + deviceControl = nullptr; + infoControl = nullptr; + viewfinderSettingsControl = nullptr; + viewfinderSettingsControl2 = nullptr; + service = nullptr; } void QCameraPrivate::updateLockStatus() @@ -328,7 +328,7 @@ QCamera::QCamera(QObject *parent): d->init(); // Select the default camera - if (d->service != 0 && d->deviceControl) + if (d->service != nullptr && d->deviceControl) d->deviceControl->setSelectedDevice(d->deviceControl->defaultDevice()); } @@ -362,9 +362,17 @@ QCamera::QCamera(const QByteArray& deviceName, QObject *parent): // The camera should not be used if device with requested name does not exist. if (!found) { - if (d->service && d->control) - d->service->releaseControl(d->control); + if (d->service) { + if (d->control) + d->service->releaseControl(d->control); + if (d->deviceControl) + d->service->releaseControl(d->deviceControl); + if (d->infoControl) + d->service->releaseControl(d->infoControl); + } d->control = nullptr; + d->deviceControl = nullptr; + d->infoControl = nullptr; d->error = QCamera::ServiceMissingError; d->errorString = QCamera::tr("The camera service is missing"); } @@ -401,7 +409,7 @@ QCamera::QCamera(QCamera::Position position, QObject *parent) Q_D(QCamera); d->init(); - if (d->service != 0 && d->deviceControl) { + if (d->service != nullptr && d->deviceControl) { bool selectDefault = true; if (d->infoControl && position != UnspecifiedPosition) { @@ -435,7 +443,7 @@ QCamera::~QCamera() QMultimedia::AvailabilityStatus QCamera::availability() const { Q_D(const QCamera); - if (d->control == NULL) + if (d->control == nullptr) return QMultimedia::ServiceMissing; if (d->deviceControl && d->deviceControl->deviceCount() == 0) @@ -489,7 +497,7 @@ void QCamera::setViewfinder(QVideoWidget *viewfinder) // We don't know (in this library) that QVideoWidget inherits QObject QObject *viewFinderObject = reinterpret_cast<QObject*>(viewfinder); - d->viewfinder = viewFinderObject && bind(viewFinderObject) ? viewFinderObject : 0; + d->viewfinder = viewFinderObject && bind(viewFinderObject) ? viewFinderObject : nullptr; } /*! @@ -510,7 +518,7 @@ void QCamera::setViewfinder(QGraphicsVideoItem *viewfinder) // but QObject inheritance depends on QObject coming first, so try this out. QObject *viewFinderObject = reinterpret_cast<QObject*>(viewfinder); - d->viewfinder = viewFinderObject && bind(viewFinderObject) ? viewFinderObject : 0; + d->viewfinder = viewFinderObject && bind(viewFinderObject) ? viewFinderObject : nullptr; } /*! @@ -530,14 +538,14 @@ void QCamera::setViewfinder(QAbstractVideoSurface *surface) if (d->viewfinder) unbind(d->viewfinder); - d->viewfinder = 0; + d->viewfinder = nullptr; if (surface && bind(&d->surfaceViewfinder)) d->viewfinder = &d->surfaceViewfinder; } else if (!surface) { //unbind the surfaceViewfinder if null surface is set unbind(&d->surfaceViewfinder); - d->viewfinder = 0; + d->viewfinder = nullptr; } } diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h index 49b4376b2..99759dbd3 100644 --- a/src/multimedia/camera/qcamera_p.h +++ b/src/multimedia/camera/qcamera_p.h @@ -71,18 +71,18 @@ class QCameraPrivate : public QMediaObjectPrivate public: QCameraPrivate(): QMediaObjectPrivate(), - provider(0), - control(0), - deviceControl(0), - locksControl(0), - infoControl(0), - viewfinderSettingsControl(0), - viewfinderSettingsControl2(0), - cameraExposure(0), - cameraFocus(0), - imageProcessing(0), - viewfinder(0), - capture(0), + provider(nullptr), + control(nullptr), + deviceControl(nullptr), + locksControl(nullptr), + infoControl(nullptr), + viewfinderSettingsControl(nullptr), + viewfinderSettingsControl2(nullptr), + cameraExposure(nullptr), + cameraFocus(nullptr), + imageProcessing(nullptr), + viewfinder(nullptr), + capture(nullptr), state(QCamera::UnloadedState), error(QCamera::NoError), requestedLocks(QCamera::NoLock), diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp index d289aed33..91950c7d2 100644 --- a/src/multimedia/camera/qcameraexposure.cpp +++ b/src/multimedia/camera/qcameraexposure.cpp @@ -98,8 +98,8 @@ void QCameraExposurePrivate::initControls() Q_Q(QCameraExposure); QMediaService *service = camera->service(); - exposureControl = 0; - flashControl = 0; + exposureControl = nullptr; + flashControl = nullptr; if (service) { exposureControl = qobject_cast<QCameraExposureControl *>(service->requestControl(QCameraExposureControl_iid)); flashControl = qobject_cast<QCameraFlashControl *>(service->requestControl(QCameraFlashControl_iid)); @@ -217,7 +217,7 @@ QCameraExposure::~QCameraExposure() */ bool QCameraExposure::isAvailable() const { - return d_func()->exposureControl != 0; + return d_func()->exposureControl != nullptr; } diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp index 848b33df8..e73a8ea46 100644 --- a/src/multimedia/camera/qcamerafocus.cpp +++ b/src/multimedia/camera/qcamerafocus.cpp @@ -339,8 +339,8 @@ void QCameraFocusPrivate::initControls() { Q_Q(QCameraFocus); - focusControl = 0; - zoomControl = 0; + focusControl = nullptr; + zoomControl = nullptr; QMediaService *service = camera->service(); if (service) { @@ -348,7 +348,7 @@ void QCameraFocusPrivate::initControls() zoomControl = qobject_cast<QCameraZoomControl *>(service->requestControl(QCameraZoomControl_iid)); } - available = focusControl != 0; + available = focusControl != nullptr; if (!focusControl) focusControl = new QCameraFocusFakeFocusControl(q); diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index cedae2609..8f364a686 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -117,11 +117,11 @@ public: }; QCameraImageCapturePrivate::QCameraImageCapturePrivate(): - mediaObject(0), - control(0), - encoderControl(0), - captureDestinationControl(0), - bufferFormatControl(0), + mediaObject(nullptr), + control(nullptr), + encoderControl(nullptr), + captureDestinationControl(nullptr), + bufferFormatControl(nullptr), error(QCameraImageCapture::NoError) { } @@ -144,11 +144,11 @@ void QCameraImageCapturePrivate::_q_readyChanged(bool ready) void QCameraImageCapturePrivate::_q_serviceDestroyed() { - mediaObject = 0; - control = 0; - encoderControl = 0; - captureDestinationControl = 0; - bufferFormatControl = 0; + mediaObject = nullptr; + control = nullptr; + encoderControl = nullptr; + captureDestinationControl = nullptr; + bufferFormatControl = nullptr; } /*! @@ -284,11 +284,11 @@ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject) } // without QCameraImageCaptureControl discard the media object - d->mediaObject = 0; - d->control = 0; - d->encoderControl = 0; - d->captureDestinationControl = 0; - d->bufferFormatControl = 0; + d->mediaObject = nullptr; + d->control = nullptr; + d->encoderControl = nullptr; + d->captureDestinationControl = nullptr; + d->bufferFormatControl = nullptr; return false; } @@ -298,7 +298,7 @@ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject) */ bool QCameraImageCapture::isAvailable() const { - if (d_func()->control != NULL) + if (d_func()->control != nullptr) return true; else return false; @@ -309,7 +309,7 @@ bool QCameraImageCapture::isAvailable() const */ QMultimedia::AvailabilityStatus QCameraImageCapture::availability() const { - if (d_func()->control != NULL) + if (d_func()->control != nullptr) return QMultimedia::Available; else return QMultimedia::ServiceMissing; diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp index 737b74b73..c2cefeae7 100644 --- a/src/multimedia/camera/qcameraimageprocessing.cpp +++ b/src/multimedia/camera/qcameraimageprocessing.cpp @@ -130,7 +130,7 @@ void QCameraImageProcessingPrivate::initControls() if (service) imageControl = qobject_cast<QCameraImageProcessingControl *>(service->requestControl(QCameraImageProcessingControl_iid)); - available = (imageControl != 0); + available = (imageControl != nullptr); if (!imageControl) imageControl = new QCameraImageProcessingFakeControl(q_ptr); |