Merge branch 'radio' into 'master'

Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0

4 files changed, 375 insertions, 1 deletions

diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index 18684d578..7c684253b 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -48,6 +48,7 @@
 #include "qdeclarativemediametadata_p.h"
 #include "qdeclarativeaudio_p.h"
 #include "qdeclarativevideooutput_p.h"
+#include "qdeclarativeradio_p.h"
 #if 0
 #include "qdeclarativecamera_p.h"
 #include "qdeclarativecamerapreviewprovider_p.h"
@@ -69,6 +70,7 @@ public:
         qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "Audio");
         qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "MediaPlayer");
         qmlRegisterType<QDeclarativeVideoOutput>(uri, 4, 0, "VideoOutput");
+        qmlRegisterType<QDeclarativeRadio>(uri, 4, 0, "Radio");
         /* Disabled until ported to scenegraph */
 #if 0
         qmlRegisterType<QDeclarativeCamera>(uri, 4, 0, "Camera");
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro
index 1a2e757a9..75ca764c8 100644
--- a/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@ -16,7 +16,7 @@ HEADERS += \
         qsgvideonode_p.h \
         qsgvideonode_i420.h \
         qsgvideonode_rgb32.h \
-
+        qdeclarativeradio_p.h
 
 SOURCES += \
         multimedia.cpp \
@@ -26,6 +26,7 @@ SOURCES += \
         qsgvideonode.cpp \
         qsgvideonode_i420.cpp \
         qsgvideonode_rgb32.cpp \
+        qdeclarativeradio.cpp
 
 disabled {
     HEADERS += \
diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp
new file mode 100644
index 000000000..5debda7ba
--- /dev/null
+++ b/src/imports/multimedia/qdeclarativeradio.cpp
@@ -0,0 +1,198 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** 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$
+**
+****************************************************************************/
+
+#include "qdeclarativeradio_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeRadio::QDeclarativeRadio(QObject *parent) :
+    QObject(parent),
+    m_radioTuner(0)
+{
+    m_radioTuner = new QRadioTuner(this);
+
+    connect(m_radioTuner, SIGNAL(stateChanged(QRadioTuner::State)), this, SLOT(_q_stateChanged(QRadioTuner::State)));
+    connect(m_radioTuner, SIGNAL(bandChanged(QRadioTuner::Band)), this, SLOT(_q_bandChanged(QRadioTuner::Band)));
+
+    connect(m_radioTuner, SIGNAL(frequencyChanged(int)), this, SIGNAL(frequencyChanged(int)));
+    connect(m_radioTuner, SIGNAL(stereoStatusChanged(bool)), this, SIGNAL(stereoStatusChanged(bool)));
+    connect(m_radioTuner, SIGNAL(searchingChanged(bool)), this, SIGNAL(searchingChanged(bool)));
+    connect(m_radioTuner, SIGNAL(signalStrengthChanged(int)), this, SIGNAL(signalStrengthChanged(int)));
+    connect(m_radioTuner, SIGNAL(volumeChanged(int)), this, SIGNAL(volumeChanged(int)));
+    connect(m_radioTuner, SIGNAL(mutedChanged(bool)), this, SIGNAL(mutedChanged(bool)));
+
+    connect(m_radioTuner, SIGNAL(error(QRadioTuner::Error)), this, SLOT(_q_error(QRadioTuner::Error)));
+}
+
+QDeclarativeRadio::~QDeclarativeRadio()
+{
+}
+
+QDeclarativeRadio::State QDeclarativeRadio::state() const
+{
+    return static_cast<QDeclarativeRadio::State>(m_radioTuner->state());
+}
+
+QDeclarativeRadio::Band QDeclarativeRadio::band() const
+{
+    return static_cast<QDeclarativeRadio::Band>(m_radioTuner->band());
+}
+
+int QDeclarativeRadio::frequency() const
+{
+    return m_radioTuner->frequency();
+}
+
+QDeclarativeRadio::StereoMode QDeclarativeRadio::stereoMode() const
+{
+    return static_cast<QDeclarativeRadio::StereoMode>(m_radioTuner->stereoMode());
+}
+
+int QDeclarativeRadio::volume() const
+{
+    return m_radioTuner->volume();
+}
+
+bool QDeclarativeRadio::muted() const
+{
+    return m_radioTuner->isMuted();
+}
+
+bool QDeclarativeRadio::stereo() const
+{
+    return m_radioTuner->isStereo();
+}
+
+int QDeclarativeRadio::signalStrength() const
+{
+    return m_radioTuner->signalStrength();
+}
+
+bool QDeclarativeRadio::searching() const
+{
+    return m_radioTuner->isSearching();
+}
+
+int QDeclarativeRadio::frequencyStep() const
+{
+    return m_radioTuner->frequencyStep(m_radioTuner->band());
+}
+
+int QDeclarativeRadio::minimumFrequency() const
+{
+    return m_radioTuner->frequencyRange(m_radioTuner->band()).first;
+}
+
+int QDeclarativeRadio::maximumFrequency() const
+{
+    return m_radioTuner->frequencyRange(m_radioTuner->band()).second;
+}
+
+bool QDeclarativeRadio::isAvailable() const
+{
+    return m_radioTuner->isAvailable();
+}
+
+void QDeclarativeRadio::setBand(QDeclarativeRadio::Band band)
+{
+    m_radioTuner->setBand(static_cast<QRadioTuner::Band>(band));
+}
+
+void QDeclarativeRadio::setFrequency(int frequency)
+{
+    m_radioTuner->setFrequency(frequency);
+}
+
+void QDeclarativeRadio::setStereoMode(QDeclarativeRadio::StereoMode stereoMode)
+{
+    m_radioTuner->setStereoMode(static_cast<QRadioTuner::StereoMode>(stereoMode));
+}
+
+void QDeclarativeRadio::setVolume(int volume)
+{
+    m_radioTuner->setVolume(volume);
+}
+
+void QDeclarativeRadio::setMuted(bool muted)
+{
+    m_radioTuner->setMuted(muted);
+}
+
+void QDeclarativeRadio::cancelSearch()
+{
+    m_radioTuner->cancelSearch();
+}
+
+void QDeclarativeRadio::searchBackward()
+{
+    m_radioTuner->searchBackward();
+}
+
+void QDeclarativeRadio::searchForward()
+{
+    m_radioTuner->searchForward();
+}
+
+void QDeclarativeRadio::start()
+{
+    m_radioTuner->start();
+}
+
+void QDeclarativeRadio::stop()
+{
+    m_radioTuner->stop();
+}
+
+void QDeclarativeRadio::_q_stateChanged(QRadioTuner::State state)
+{
+    emit stateChanged(static_cast<QDeclarativeRadio::State>(state));
+}
+
+void QDeclarativeRadio::_q_bandChanged(QRadioTuner::Band band)
+{
+    emit bandChanged(static_cast<QDeclarativeRadio::Band>(band));
+}
+
+void QDeclarativeRadio::_q_error(QRadioTuner::Error errorCode)
+{
+    emit error(static_cast<QDeclarativeRadio::Error>(errorCode));
+    emit errorChanged();
+}
diff --git a/src/imports/multimedia/qdeclarativeradio_p.h b/src/imports/multimedia/qdeclarativeradio_p.h
new file mode 100644
index 000000000..498e60fe3
--- /dev/null
+++ b/src/imports/multimedia/qdeclarativeradio_p.h
@@ -0,0 +1,173 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** 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 QDECLARATIVERADIO_P_H
+#define QDECLARATIVERADIO_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 <QtDeclarative/qdeclarative.h>
+#include <qradiotuner.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeRadio : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(State state READ state NOTIFY stateChanged)
+    Q_PROPERTY(Band band READ band WRITE setBand NOTIFY bandChanged)
+    Q_PROPERTY(int frequency READ frequency WRITE setFrequency NOTIFY frequencyChanged)
+    Q_PROPERTY(bool stereo READ stereo NOTIFY stereoStatusChanged)
+    Q_PROPERTY(StereoMode stereoMode READ stereoMode WRITE setStereoMode)
+    Q_PROPERTY(int signalStrength READ signalStrength NOTIFY signalStrengthChanged)
+    Q_PROPERTY(int volume READ volume WRITE setVolume NOTIFY volumeChanged)
+    Q_PROPERTY(bool muted READ muted WRITE setMuted NOTIFY mutedChanged)
+    Q_PROPERTY(bool searching READ searching NOTIFY searchingChanged)
+    Q_PROPERTY(int frequencyStep READ frequencyStep NOTIFY bandChanged)
+    Q_PROPERTY(int minimumFrequency READ minimumFrequency NOTIFY bandChanged)
+    Q_PROPERTY(int maximumFrequency READ maximumFrequency NOTIFY bandChanged)
+    Q_ENUMS(State)
+    Q_ENUMS(Band)
+    Q_ENUMS(Error)
+    Q_ENUMS(StereoMode)
+
+public:
+    enum State {
+        ActiveState = QRadioTuner::ActiveState,
+        StoppedState = QRadioTuner::StoppedState
+    };
+
+    enum Band {
+        AM = QRadioTuner::AM,
+        FM = QRadioTuner::FM,
+        SW = QRadioTuner::SW,
+        LW = QRadioTuner::LW,
+        FM2 = QRadioTuner::FM2
+    };
+
+    enum Error {
+        NoError = QRadioTuner::NoError,
+        ResourceError = QRadioTuner::ResourceError,
+        OpenError = QRadioTuner::OpenError,
+        OutOfRangeError = QRadioTuner::OutOfRangeError
+    };
+
+    enum StereoMode {
+        ForceStereo = QRadioTuner::ForceStereo,
+        ForceMono = QRadioTuner::ForceMono,
+        Auto = QRadioTuner::Auto
+    };
+
+    QDeclarativeRadio(QObject *parent = 0);
+    ~QDeclarativeRadio();
+
+    QDeclarativeRadio::State state() const;
+    QDeclarativeRadio::Band band() const;
+    int frequency() const;
+    QDeclarativeRadio::StereoMode stereoMode() const;
+    int volume() const;
+    bool muted() const;
+
+    bool stereo() const;
+    int signalStrength() const;
+    bool searching() const;
+
+    int frequencyStep() const;
+    int minimumFrequency() const;
+    int maximumFrequency() const;
+
+    Q_INVOKABLE bool isAvailable() const;
+
+public Q_SLOTS:
+    void setBand(QDeclarativeRadio::Band band);
+    void setFrequency(int frequency);
+    void setStereoMode(QDeclarativeRadio::StereoMode stereoMode);
+    void setVolume(int volume);
+    void setMuted(bool muted);
+
+    void cancelSearch();
+    void searchBackward();
+    void searchForward();
+    void start();
+    void stop();
+
+Q_SIGNALS:
+    void stateChanged(QDeclarativeRadio::State state);
+    void bandChanged(QDeclarativeRadio::Band band);
+    void frequencyChanged(int frequency);
+    void stereoStatusChanged(bool stereo);
+    void searchingChanged(bool searching);
+    void signalStrengthChanged(int signalStrength);
+    void volumeChanged(int volume);
+    void mutedChanged(bool muted);
+
+    void errorChanged();
+    void error(QDeclarativeRadio::Error errorCode);
+
+private Q_SLOTS:
+    void _q_stateChanged(QRadioTuner::State state);
+    void _q_bandChanged(QRadioTuner::Band band);
+    void _q_error(QRadioTuner::Error errorCode);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeRadio)
+
+    QRadioTuner *m_radioTuner;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeRadio))
+
+QT_END_HEADER
+
+#endif // QDECLARATIVERADIO_P_H