slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added antennaConnected property to QRadioTuner and radio qml element

Browse Source 
Change-Id: I5af8487277e0444629c710c6a0a4e890a8d35c6f
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Jonas Rabbe
2012-01-30 13:53:30 +10:00
committed by Qt by Nokia
parent 5e801e2793
commit 9d3102efe2
6 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/multimedia/radio/qradiotuner.cpp
View File

@@ -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)));
}
}
@@ -430,6 +431,20 @@ bool QRadioTuner::isSearching() const
return false;
}
/*!
\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.

4
src/multimedia/radio/qradiotuner.h
View File

@@ -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);