diff options
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h b/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h index c5030ffb4..0180e6f40 100644 --- a/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h +++ b/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h @@ -1,7 +1,8 @@ /**************************************************************************** ** ** Copyright (C) 2013 Jolla Ltd. -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Toolkit. ** @@ -10,9 +11,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -36,29 +37,23 @@ #include <qcameraviewfindersettingscontrol.h> -#include <QtCore/qsize.h> - QT_BEGIN_NAMESPACE +class CameraBinSession; + class CameraBinViewfinderSettings : public QCameraViewfinderSettingsControl { Q_OBJECT public: - CameraBinViewfinderSettings(QObject *parent); + CameraBinViewfinderSettings(CameraBinSession *session); ~CameraBinViewfinderSettings(); bool isViewfinderParameterSupported(ViewfinderParameter parameter) const; QVariant viewfinderParameter(ViewfinderParameter parameter) const; void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value); - QSize resolution() const; - qreal minimumFrameRate() const; - qreal maximumFrameRate() const; - private: - QSize m_resolution; - qreal m_minimumFrameRate; - qreal m_maximumFrameRate; + CameraBinSession *m_session; }; QT_END_NAMESPACE |