Replaced camera viewfinder resolution control with settings control

It allows to specify a number of camera fiewfinder parameters
including frame rate, resolution and pixel format.

It also allows to extend the list of parameters without breaking source
or binary compatibility.

Change-Id: Ibea85a968ab7ee7b8d1ae34c7fcbac8f5586f53f
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>

1 files changed, 85 insertions, 0 deletions

diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.h b/src/multimedia/controls/qcameraviewfindersettingscontrol.h
new file mode 100644
index 000000000..58c838774
--- /dev/null
+++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+
+#ifndef QCAMERAVIEWFINDERSETTINGSCONTROL_H
+#define QCAMERAVIEWFINDERSETTINGSCONTROL_H
+
+#include <qmediacontrol.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
+class Q_MULTIMEDIA_EXPORT QCameraViewfinderSettingsControl : public QMediaControl
+{
+    Q_OBJECT
+public:
+    enum ViewfinderParameter {
+        Resolution,
+        PixelAspectRatio,
+        MinimumFrameRate,
+        MaximumFrameRate,
+        PixelFormat,
+        UserParameter = 1000
+    };
+
+    ~QCameraViewfinderSettingsControl();
+
+    virtual bool isViewfinderParameterSupported(ViewfinderParameter parameter) const = 0;
+    virtual QVariant viewfinderParameter(ViewfinderParameter parameter) const = 0;
+    virtual void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) = 0;
+
+protected:
+    QCameraViewfinderSettingsControl(QObject *parent = 0);
+};
+
+#define QCameraViewfinderSettingsControl_iid "org.qt-project.qt.cameraviewfindersettingscontrol/5.0"
+Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderSettingsControl, QCameraViewfinderSettingsControl_iid)
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QCAMERAVIEWFINDERSETTINGSCONTROL_H