diff options
| -rw-r--r-- | src/multimediakit/qcameraimagecapture.cpp | 13 | ||||
| -rw-r--r-- | src/multimediakit/qcameraimagecapture.h | 1 | ||||
| -rw-r--r-- | tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp | 24 |
3 files changed, 38 insertions, 0 deletions
diff --git a/src/multimediakit/qcameraimagecapture.cpp b/src/multimediakit/qcameraimagecapture.cpp index 145eb0991..541b7db78 100644 --- a/src/multimediakit/qcameraimagecapture.cpp +++ b/src/multimediakit/qcameraimagecapture.cpp @@ -109,6 +109,7 @@ public: void _q_error(int id, int error, const QString &errorString); void _q_readyChanged(bool); + void _q_serviceDestroyed(); void unsetError() { error = QCameraImageCapture::NoError; errorString.clear(); } @@ -141,6 +142,14 @@ void QCameraImageCapturePrivate::_q_readyChanged(bool ready) emit q->readyForCaptureChanged(ready); } +void QCameraImageCapturePrivate::_q_serviceDestroyed() +{ + mediaObject = 0; + control = 0; + encoderControl = 0; + captureDestinationControl = 0; + bufferFormatControl = 0; +} /*! Constructs a media recorder which records the media produced by \a mediaObject. @@ -225,6 +234,8 @@ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject) service->releaseControl(d->captureDestinationControl); if (d->bufferFormatControl) service->releaseControl(d->bufferFormatControl); + + disconnect(service, SIGNAL(destroyed()), this, SLOT(_q_serviceDestroyed())); } } @@ -269,6 +280,8 @@ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject) this, SIGNAL(bufferFormatChanged(QVideoFrame::PixelFormat))); } + connect(service, SIGNAL(destroyed()), this, SLOT(_q_serviceDestroyed())); + return true; } } diff --git a/src/multimediakit/qcameraimagecapture.h b/src/multimediakit/qcameraimagecapture.h index 0b4601ef1..0e33f37fb 100644 --- a/src/multimediakit/qcameraimagecapture.h +++ b/src/multimediakit/qcameraimagecapture.h @@ -145,6 +145,7 @@ private: Q_DECLARE_PRIVATE(QCameraImageCapture) Q_PRIVATE_SLOT(d_func(), void _q_error(int, int, const QString &)) Q_PRIVATE_SLOT(d_func(), void _q_readyChanged(bool)) + Q_PRIVATE_SLOT(d_func(), void _q_serviceDestroyed()) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QCameraImageCapture::CaptureDestinations) diff --git a/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp index 8869dd6ce..ab198d553 100644 --- a/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp +++ b/tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp @@ -107,6 +107,7 @@ public slots: private slots: void constructor(); void mediaObject(); + void deleteMediaObject(); void isReadyForCapture(); void capture(); void cancelCapture(); @@ -165,6 +166,29 @@ void tst_QCameraImageCapture::mediaObject() QCOMPARE(medobj1, &camera1); } +void tst_QCameraImageCapture::deleteMediaObject() +{ + MockMediaServiceProvider *provider = new MockMediaServiceProvider; + provider->service = new MockCameraService; + + QCamera *camera = new QCamera(0, provider); + QCameraImageCapture *capture = new QCameraImageCapture(camera); + + QVERIFY(capture->mediaObject() == camera); + QVERIFY(capture->isAvailable()); + + delete camera; + delete provider->service; + delete provider; + + //capture should detach from camera + QVERIFY(capture->mediaObject() == 0); + QVERIFY(!capture->isAvailable()); + + capture->capture(); + delete capture; +} + //MaemoAPI-1825:test isReadyForCapture void tst_QCameraImageCapture::isReadyForCapture() { |