summaryrefslogtreecommitdiffstats
path: root/src/multimedia/radio
diff options
context:
space:
mode:
authorJonas Rabbe <jonas.rabbe@nokia.com>2012-01-30 13:53:30 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-30 21:32:18 +0100
commit9d3102efe29e294971b30aa2ce00be5cb7db5e05 (patch)
treefe8447f4b96bce51a644695b1ed502947907ebc8 /src/multimedia/radio
parent5e801e27939a6c024ff2b439d348ddf9d5516f9c (diff)
Added antennaConnected property to QRadioTuner and radio qml element
Change-Id: I5af8487277e0444629c710c6a0a4e890a8d35c6f Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/multimedia/radio')
-rw-r--r--src/multimedia/radio/qradiotuner.cpp15
-rw-r--r--src/multimedia/radio/qradiotuner.h4
2 files changed, 19 insertions, 0 deletions
diff --git a/src/multimedia/radio/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp
index ab5f228a6..e0aeaa2c5 100644
--- a/src/multimedia/radio/qradiotuner.cpp
+++ b/src/multimedia/radio/qradiotuner.cpp
@@ -128,6 +128,7 @@ QRadioTuner::QRadioTuner(QObject *parent):
connect(d->control, SIGNAL(volumeChanged(int)), SIGNAL(volumeChanged(int)));
connect(d->control, SIGNAL(mutedChanged(bool)), SIGNAL(mutedChanged(bool)));
connect(d->control, SIGNAL(stationFound(int,QString)), SIGNAL(stationFound(int,QString)));
+ connect(d->control, SIGNAL(antennaConnectedChanged(bool)), SIGNAL(antennaConnectedChanged(bool)));
connect(d->control, SIGNAL(error(QRadioTuner::Error)), SIGNAL(error(QRadioTuner::Error)));
}
}
@@ -431,6 +432,20 @@ bool QRadioTuner::isSearching() const
}
/*!
+ \property QRadioTuner::antennaConnected
+ \brief whether there is an antenna connected
+*/
+bool QRadioTuner::isAntennaConnected() const
+{
+ Q_D(const QRadioTuner);
+
+ if (d->control != 0)
+ return d->control->isAntennaConnected();
+
+ return false;
+}
+
+/*!
Starts a forward scan for a signal, starting from the current \l frequency.
\sa searchBackward(), cancelSearch(), searching
diff --git a/src/multimedia/radio/qradiotuner.h b/src/multimedia/radio/qradiotuner.h
index 9236de98e..46c6cfeb1 100644
--- a/src/multimedia/radio/qradiotuner.h
+++ b/src/multimedia/radio/qradiotuner.h
@@ -69,6 +69,7 @@ class Q_MULTIMEDIA_EXPORT QRadioTuner : public QMediaObject
Q_PROPERTY(int volume READ volume WRITE setVolume NOTIFY volumeChanged)
Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
Q_PROPERTY(bool searching READ isSearching NOTIFY searchingChanged)
+ Q_PROPERTY(bool antennaConnected READ isAntennaConnected NOTIFY antennaConnectedChanged)
Q_ENUMS(State)
Q_ENUMS(Band)
Q_ENUMS(Error)
@@ -109,6 +110,8 @@ public:
bool isSearching() const;
+ bool isAntennaConnected() const;
+
Error error() const;
QString errorString() const;
@@ -137,6 +140,7 @@ Q_SIGNALS:
void volumeChanged(int volume);
void mutedChanged(bool muted);
void stationFound(int frequency, QString stationId);
+ void antennaConnectedChanged(bool connectionStatus);
void error(QRadioTuner::Error error);