diff options
| -rw-r--r-- | examples/declarative-radio/declarative-radio.pro | 10 | ||||
| -rw-r--r-- | examples/declarative-radio/declarative-radio.qrc | 6 | ||||
| -rw-r--r-- | examples/declarative-radio/main.cpp | 58 | ||||
| -rw-r--r-- | examples/declarative-radio/view.qml | 175 | ||||
| -rw-r--r-- | examples/examples.pro | 1 | ||||
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativeradio.cpp | 188 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativeradio_p.h | 167 |
9 files changed, 609 insertions, 0 deletions
diff --git a/examples/declarative-radio/declarative-radio.pro b/examples/declarative-radio/declarative-radio.pro new file mode 100644 index 000000000..f3dab6411 --- /dev/null +++ b/examples/declarative-radio/declarative-radio.pro @@ -0,0 +1,10 @@ +TEMPLATE = app +TARGET = declarative-radio +DEPENDPATH += . +INCLUDEPATH += . +QT += declarative multimediakit + +# Input +SOURCES += main.cpp +RESOURCES += declarative-radio.qrc + diff --git a/examples/declarative-radio/declarative-radio.qrc b/examples/declarative-radio/declarative-radio.qrc new file mode 100644 index 000000000..ed01a64f6 --- /dev/null +++ b/examples/declarative-radio/declarative-radio.qrc @@ -0,0 +1,6 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> +<file>view.qml</file> +</qresource> +</RCC> + diff --git a/examples/declarative-radio/main.cpp b/examples/declarative-radio/main.cpp new file mode 100644 index 000000000..462fd829e --- /dev/null +++ b/examples/declarative-radio/main.cpp @@ -0,0 +1,58 @@ +/**************************************************************************** + ** + ** 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 demonstration applications of the Qt Toolkit. + ** + ** $QT_BEGIN_LICENSE:BSD$ + ** You may use this file under the terms of the BSD license as follows: + ** + ** "Redistribution and use in source and binary forms, with or without + ** modification, are permitted provided that the following conditions are + ** met: + ** * Redistributions of source code must retain the above copyright + ** notice, this list of conditions and the following disclaimer. + ** * Redistributions in binary form must reproduce the above copyright + ** notice, this list of conditions and the following disclaimer in + ** the documentation and/or other materials provided with the + ** distribution. + ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor + ** the names of its contributors may be used to endorse or promote + ** products derived from this software without specific prior written + ** permission. + ** + ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." + ** $QT_END_LICENSE$ + ** + ****************************************************************************/ + +#include <QApplication> + +#include <qdeclarative.h> +#include <qsgview.h> + + +int main(int argc, char ** argv) +{ + QApplication app(argc, argv); + + QSGView view; + + view.setSource(QUrl("qrc:view.qml")); + view.show(); + + return app.exec(); +} + diff --git a/examples/declarative-radio/view.qml b/examples/declarative-radio/view.qml new file mode 100644 index 000000000..e598cb354 --- /dev/null +++ b/examples/declarative-radio/view.qml @@ -0,0 +1,175 @@ +/**************************************************************************** + ** + ** 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 examples of the Qt Toolkit. + ** + ** $QT_BEGIN_LICENSE:BSD$ + ** You may use this file under the terms of the BSD license as follows: + ** + ** "Redistribution and use in source and binary forms, with or without + ** modification, are permitted provided that the following conditions are + ** met: + ** * Redistributions of source code must retain the above copyright + ** notice, this list of conditions and the following disclaimer. + ** * Redistributions in binary form must reproduce the above copyright + ** notice, this list of conditions and the following disclaimer in + ** the documentation and/or other materials provided with the + ** distribution. + ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor + ** the names of its contributors may be used to endorse or promote + ** products derived from this software without specific prior written + ** permission. + ** + ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." + ** $QT_END_LICENSE$ + ** + ****************************************************************************/ + +import QtQuick 2.0 +import Qt.multimediakit 4.0 + +Rectangle { + width: 400; height: 300; + + Radio { + id: radio + } + + Column { + anchors.fill: parent + anchors.margins: 5 + + Row { + + Text { + id: freq + + width: 150 + height: 200 + + verticalAlignment: Text.AlignVCenter + text: "" + radio.frequency / 1000 + " kHz"; + } + Text { + id: sig + + width: 200 + height: 200 + + verticalAlignment: Text.AlignVCenter + text: (radio.isAvailable() ? "No Signal " : "No Radio Found") + } + } + + + Row { + spacing: 5 + + Rectangle { + id: scanDownButton + border.color: "black" + border.width: 1 + radius: 2 + + width: 90 + height: 40 + + Text { + anchors.fill: parent + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + text: "Scan Down" + } + + MouseArea { + anchors.fill: parent + onClicked: radio.searchBackward(); + } + } + Rectangle { + id: freqDownButton + border.color: "black" + border.width: 1 + radius: 2 + + width: 90 + height: 40 + + Text { + anchors.fill: parent + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + text: "Freq Down" + } + + MouseArea { + anchors.fill: parent + onClicked: { + var f = radio.frequency; + f = f - radio.frequencyStep(Radio.FM); + radio.setFrequency(f); + } + } + } + Rectangle { + id: freqUpButton + border.color: "black" + border.width: 1 + radius: 2 + + width: 90 + height: 40 + + Text { + anchors.fill: parent + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + text: "Freq Up" + } + + MouseArea { + anchors.fill: parent + onClicked: { + var f = radio.frequency; + f = f + radio.frequencyStep(Radio.FM); + radio.setFrequency(f); + } + } + } + Rectangle { + id: scanUpButton + border.color: "black" + border.width: 1 + radius: 2 + + width: 90 + height: 40 + + Text { + anchors.fill: parent + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter + text: "Scan Up" + } + + MouseArea { + anchors.fill: parent + onClicked: radio.searchForward(); + } + } + } + } +} diff --git a/examples/examples.pro b/examples/examples.pro index 2a1a2338e..750d1f075 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -15,5 +15,6 @@ SUBDIRS += \ contains(QT_CONFIG, declarative) { disabled:SUBDIRS += declarative-camera + SUBDIRS += declarative-radio } diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index b274830fe..9b34dcf68 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -47,6 +47,7 @@ #include "qdeclarativemediametadata_p.h" #include "qdeclarativeaudio_p.h" +#include "qdeclarativeradio_p.h" #if 0 #include "qdeclarativevideo_p.h" #include "qdeclarativecamera_p.h" @@ -67,6 +68,7 @@ public: qmlRegisterType<QSoundEffect>(uri, 4, 0, "SoundEffect"); qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "Audio"); + qmlRegisterType<QDeclarativeRadio>(uri, 4, 0, "Radio"); /* Disabled until ported to scenegraph */ #if 0 qmlRegisterType<QDeclarativeVideo>(uri, 4, 0, "Video"); diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 845fe9b96..aed7cda4f 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -12,11 +12,13 @@ HEADERS += \ qdeclarativeaudio_p.h \ qdeclarativemediabase_p.h \ qdeclarativemediametadata_p.h \ + qdeclarativeradio_p.h SOURCES += \ multimedia.cpp \ qdeclarativeaudio.cpp \ qdeclarativemediabase.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..3de5a46fd --- /dev/null +++ b/src/imports/multimedia/qdeclarativeradio.cpp @@ -0,0 +1,188 @@ +/**************************************************************************** +** +** 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(); +} + +bool QDeclarativeRadio::isAvailable() const +{ + return m_radioTuner->isAvailable(); +} + +int QDeclarativeRadio::frequencyStep(QDeclarativeRadio::Band band) const +{ + return m_radioTuner->frequencyStep(static_cast<QRadioTuner::Band>(band)); +} + +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..89385a51d --- /dev/null +++ b/src/imports/multimedia/qdeclarativeradio_p.h @@ -0,0 +1,167 @@ +/**************************************************************************** +** +** 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_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; + + Q_INVOKABLE bool isAvailable() const; + Q_INVOKABLE int frequencyStep(QDeclarativeRadio::Band band) 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 |