389d66b3ed
Almost entire rewrite of the camera backend. It doesn't provide new features but is more stable and behave as it should. - Correctly report camera state and status - Correctly report if the camera is ready to capture - Emit imageExposed() signal - Save captured images in an appropriate directory - Images can be captured even without a viewport - Better error handling Removed the custom QVideoWidgetControl as it doesn't provide anything more than the QVideoWidget's renderer control fallback. Task-number: QTBUG-33782 Change-Id: I9baf6f83e7c69619f20a101921f7865a1c90d5e4 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
91 lines
3.2 KiB
C++
91 lines
3.2 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/legal
|
|
**
|
|
** This file is part of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and Digia. For licensing terms and
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
** use the contact form at http://qt.digia.com/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Digia gives you certain additional
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3.0 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.GPL included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU General Public License version 3.0 requirements will be
|
|
** met: http://www.gnu.org/copyleft/gpl.html.
|
|
**
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <QtCore/QDebug>
|
|
|
|
#include "dsimagecapturecontrol.h"
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
DSImageCaptureControl::DSImageCaptureControl(DSCameraSession *session)
|
|
: QCameraImageCaptureControl(session)
|
|
, m_session(session)
|
|
{
|
|
connect(m_session, SIGNAL(imageExposed(int)),
|
|
this, SIGNAL(imageExposed(int)));
|
|
connect(m_session, SIGNAL(imageCaptured(int,QImage)),
|
|
this, SIGNAL(imageCaptured(int,QImage)));
|
|
connect(m_session, SIGNAL(imageSaved(int,QString)),
|
|
this, SIGNAL(imageSaved(int,QString)));
|
|
connect(m_session, SIGNAL(readyForCaptureChanged(bool)),
|
|
this, SIGNAL(readyForCaptureChanged(bool)));
|
|
connect(m_session, SIGNAL(captureError(int,int,QString)),
|
|
this, SIGNAL(error(int,int,QString)));
|
|
}
|
|
|
|
DSImageCaptureControl::~DSImageCaptureControl()
|
|
{
|
|
}
|
|
|
|
bool DSImageCaptureControl::isReadyForCapture() const
|
|
{
|
|
return m_session->isReadyForCapture();
|
|
}
|
|
|
|
int DSImageCaptureControl::capture(const QString &fileName)
|
|
{
|
|
return m_session->captureImage(fileName);
|
|
}
|
|
|
|
QCameraImageCapture::DriveMode DSImageCaptureControl::driveMode() const
|
|
{
|
|
return QCameraImageCapture::SingleImageCapture;
|
|
}
|
|
|
|
void DSImageCaptureControl::setDriveMode(QCameraImageCapture::DriveMode mode)
|
|
{
|
|
if (mode != QCameraImageCapture::SingleImageCapture)
|
|
qWarning("Drive mode not supported.");
|
|
}
|
|
|
|
QT_END_NAMESPACE
|
|
|