From 63476053415a8bacef83afb651bf7c6f98d60f5e Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Thu, 17 Apr 2014 22:53:53 +1000 Subject: Add QML accessors for camera viewfinder properties. [ChangeLog] Added QML accessors for camera viewfinder properties. Change-Id: I05a2a6c552aa8606e8dc31a11d1cfdedf66c554f Reviewed-by: Yoann Lopes --- src/imports/multimedia/multimedia.pro | 6 +- src/imports/multimedia/qdeclarativecamera.cpp | 28 +++++ src/imports/multimedia/qdeclarativecamera_p.h | 4 + .../multimedia/qdeclarativecameraviewfinder.cpp | 117 +++++++++++++++++++++ .../multimedia/qdeclarativecameraviewfinder_p.h | 96 +++++++++++++++++ 5 files changed, 249 insertions(+), 2 deletions(-) create mode 100644 src/imports/multimedia/qdeclarativecameraviewfinder.cpp create mode 100644 src/imports/multimedia/qdeclarativecameraviewfinder_p.h (limited to 'src/imports/multimedia') diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index f6fdfe9cc..75974ec10 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -13,7 +13,8 @@ HEADERS += \ qdeclarativecamerafocus_p.h \ qdeclarativecameraimageprocessing_p.h \ qdeclarativecamerapreviewprovider_p.h \ - qdeclarativetorch_p.h + qdeclarativetorch_p.h \ + qdeclarativecameraviewfinder_p.h SOURCES += \ multimedia.cpp \ @@ -28,7 +29,8 @@ SOURCES += \ qdeclarativecamerafocus.cpp \ qdeclarativecameraimageprocessing.cpp \ qdeclarativecamerapreviewprovider.cpp \ - qdeclarativetorch.cpp + qdeclarativetorch.cpp \ + qdeclarativecameraviewfinder.cpp QML_FILES += \ Video.qml diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index e2a5d0097..c6c57f8c1 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -46,6 +46,7 @@ #include "qdeclarativecameraflash_p.h" #include "qdeclarativecamerafocus_p.h" #include "qdeclarativecameraimageprocessing_p.h" +#include "qdeclarativecameraviewfinder_p.h" #include "qdeclarativemediametadata_p.h" @@ -801,6 +802,33 @@ QDeclarativeMediaMetaData *QDeclarativeCamera::metaData() return m_metaData; } +/*! + \qmlproperty size QtMultimedia::Camera::viewfinder.resolution + + This property holds the resolution of the camera viewfinder. If no + resolution is given the backend will use a default value. + + \since 5.4 +*/ + +/*! + \qmlproperty real QtMultimedia::Camera::viewfinder.minimumFrameRate + \qmlproperty real QtMultimedia::Camera::viewfinder.maximumFrameRate + + These properties hold the limits of the preferred frame rate for the + viewfinder in frames per second. + + \since 5.4 + */ + +QDeclarativeCameraViewfinder *QDeclarativeCamera::viewfinder() +{ + if (!m_viewfinder) + m_viewfinder = new QDeclarativeCameraViewfinder(m_camera, this); + + return m_viewfinder; +} + QT_END_NAMESPACE #include "moc_qdeclarativecamera_p.cpp" diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index 05dd55f3a..e7745abd9 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -72,6 +72,7 @@ class QDeclarativeCameraFocus; class QDeclarativeCameraFlash; class QDeclarativeCameraImageProcessing; class QDeclarativeMediaMetaData; +class QDeclarativeCameraViewfinder; class QDeclarativeCamera : public QObject, public QQmlParserStatus { @@ -100,6 +101,7 @@ class QDeclarativeCamera : public QObject, public QQmlParserStatus Q_PROPERTY(QDeclarativeCameraFocus* focus READ focus CONSTANT) Q_PROPERTY(QDeclarativeCameraImageProcessing* imageProcessing READ imageProcessing CONSTANT) Q_PROPERTY(QDeclarativeMediaMetaData *metaData READ metaData CONSTANT REVISION 1) + Q_PROPERTY(QDeclarativeCameraViewfinder *viewfinder READ viewfinder CONSTANT REVISION 1) Q_ENUMS(CaptureMode) Q_ENUMS(State) @@ -233,6 +235,7 @@ public: QDeclarativeCameraFlash *flash() { return m_flash; } QDeclarativeCameraFocus *focus() { return m_focus; } QDeclarativeCameraImageProcessing *imageProcessing() { return m_imageProcessing; } + QDeclarativeCameraViewfinder *viewfinder(); QDeclarativeMediaMetaData *metaData(); @@ -306,6 +309,7 @@ private: QDeclarativeCameraFocus *m_focus; QDeclarativeCameraImageProcessing *m_imageProcessing; QDeclarativeMediaMetaData *m_metaData; + QDeclarativeCameraViewfinder *m_viewfinder; State m_pendingState; bool m_componentComplete; diff --git a/src/imports/multimedia/qdeclarativecameraviewfinder.cpp b/src/imports/multimedia/qdeclarativecameraviewfinder.cpp new file mode 100644 index 000000000..5fa9dada5 --- /dev/null +++ b/src/imports/multimedia/qdeclarativecameraviewfinder.cpp @@ -0,0 +1,117 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Jolla Ltd. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins 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 "qdeclarativecamera_p.h" +#include "qdeclarativecameraviewfinder_p.h" + +#include + + +QT_BEGIN_NAMESPACE + +QDeclarativeCameraViewfinder::QDeclarativeCameraViewfinder(QCamera *camera, QObject *parent) + : QObject(parent) + , m_camera(camera) + , m_control(0) +{ + if (QMediaService *service = m_camera->service()) + m_control = service->requestControl(); +} + +QDeclarativeCameraViewfinder::~QDeclarativeCameraViewfinder() +{ + if (m_control) { + if (QMediaService *service = m_camera->service()) + service->releaseControl(m_control); + } +} + +QSize QDeclarativeCameraViewfinder::resolution() const +{ + return m_control + ? m_control->viewfinderParameter(QCameraViewfinderSettingsControl::Resolution).value() + : QSize(); +} + +void QDeclarativeCameraViewfinder::setResolution(const QSize &resolution) +{ + if (m_control) { + m_control->setViewfinderParameter( + QCameraViewfinderSettingsControl::Resolution, resolution); + emit resolutionChanged(); + } +} + +qreal QDeclarativeCameraViewfinder::minimumFrameRate() const +{ + return m_control + ? m_control->viewfinderParameter(QCameraViewfinderSettingsControl::MinimumFrameRate).value() + : 0.0; +} + +void QDeclarativeCameraViewfinder::setMinimumFrameRate(qreal frameRate) +{ + if (m_control) { + m_control->setViewfinderParameter( + QCameraViewfinderSettingsControl::MinimumFrameRate, frameRate); + emit minimumFrameRateChanged(); + } +} + +qreal QDeclarativeCameraViewfinder::maximumFrameRate() const +{ + return m_control + ? m_control->viewfinderParameter(QCameraViewfinderSettingsControl::MaximumFrameRate).value() + : 0.0; +} + +void QDeclarativeCameraViewfinder::setMaximumFrameRate(qreal frameRate) +{ + if (m_control) { + m_control->setViewfinderParameter( + QCameraViewfinderSettingsControl::MaximumFrameRate, frameRate); + emit maximumFrameRateChanged(); + } +} + +QT_END_NAMESPACE + +#include "moc_qdeclarativecameraviewfinder_p.cpp" diff --git a/src/imports/multimedia/qdeclarativecameraviewfinder_p.h b/src/imports/multimedia/qdeclarativecameraviewfinder_p.h new file mode 100644 index 000000000..e28eb7988 --- /dev/null +++ b/src/imports/multimedia/qdeclarativecameraviewfinder_p.h @@ -0,0 +1,96 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Jolla Ltd. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins 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$ +** +****************************************************************************/ + +#ifndef QDECLARATIVECAMERAVIEWFINDER_P_H +#define QDECLARATIVECAMERAVIEWFINDER_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class QDeclarativeCamera; +class QCameraViewfinderSettingsControl; + +class QDeclarativeCameraViewfinder : public QObject +{ + Q_OBJECT + Q_PROPERTY(QSize resolution READ resolution WRITE setResolution NOTIFY resolutionChanged) + Q_PROPERTY(qreal minimumFrameRate READ minimumFrameRate WRITE setMinimumFrameRate NOTIFY minimumFrameRateChanged) + Q_PROPERTY(qreal maximumFrameRate READ maximumFrameRate WRITE setMaximumFrameRate NOTIFY maximumFrameRateChanged) +public: + QDeclarativeCameraViewfinder(QCamera *camera, QObject *parent = 0); + ~QDeclarativeCameraViewfinder(); + + QSize resolution() const; + void setResolution(const QSize &resolution); + + qreal minimumFrameRate() const; + void setMinimumFrameRate(qreal frameRate); + + qreal maximumFrameRate() const; + void setMaximumFrameRate(qreal frameRate); + +Q_SIGNALS: + void resolutionChanged(); + void minimumFrameRateChanged(); + void maximumFrameRateChanged(); + +private: + QCamera *m_camera; + QCameraViewfinderSettingsControl *m_control; +}; + +QT_END_NAMESPACE + +#endif -- cgit v1.2.3