Expose availability from the backend to C++ and QML.

The availabilityError property was static based on the service, but it
can change at run time, so add the plumbing to allow the backend to
report it itself.

Also make sure that both QML and C++ expose the availability.

The radio tuner and data controls previously had properties (but no
signals) for availability - these have been removed.

Change-Id: I9240cf93e2a51b14cd38642f9312ae3c75f05361
Reviewed-by: Ling Hu <ling.hu@nokia.com>

7 files changed, 194 insertions, 33 deletions

diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri
index 99c9631d1..919e2055c 100644
--- a/src/multimedia/controls/controls.pri
+++ b/src/multimedia/controls/controls.pri
@@ -33,7 +33,8 @@ PUBLIC_HEADERS += \
     controls/qvideoencodercontrol.h \
     controls/qvideorenderercontrol.h \
     controls/qmediaaudioprobecontrol.h \
-    controls/qmediavideoprobecontrol.h
+    controls/qmediavideoprobecontrol.h \
+    controls/qmediaavailabilitycontrol.h
 
 PRIVATE_HEADERS += \
     controls/qaudiodecodercontrol_p.h
@@ -71,4 +72,7 @@ SOURCES += \
     controls/qvideorenderercontrol.cpp \
     controls/qmediaaudioprobecontrol.cpp \
     controls/qmediavideoprobecontrol.cpp \
-    controls/qaudiodecodercontrol_p.cpp
+    controls/qaudiodecodercontrol_p.cpp \
+    controls/qmediaavailabilitycontrol.cpp
+
+
diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.cpp b/src/multimedia/controls/qmediaavailabilitycontrol.cpp
new file mode 100644
index 000000000..76f615049
--- /dev/null
+++ b/src/multimedia/controls/qmediaavailabilitycontrol.cpp
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#include "qmediaavailabilitycontrol.h"
+#include "qmediacontrol_p.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QMediaAvailabilityControl
+
+    \brief The QMediaAvailabilityControl class supplies a control for reporting availability of a service.
+
+    \inmodule QtMultimedia
+
+    \ingroup multimedia
+    \ingroup multimedia_control
+
+    An instance of QMediaObject (or its derived classes) can report any changes
+    in availability via this control.
+
+    The interface name of QMediaAvailabilityControl is \c com.nokia.Qt.QMediaAvailabilityControl/1.0 as
+    defined in QMediaAvailabilityControl_iid.
+
+    \sa QMediaService::requestControl(), QMediaObject
+*/
+
+/*!
+    \macro QMediaAvailabilityControl_iid
+
+    \c com.nokia.Qt.QMediaAvailabilityControl/1.0
+
+    Defines the interface name of the QMediaAvailabilityControl class.
+
+    \relates QMediaAvailabilityControl
+*/
+
+/*!
+    Constructs an availability control object with \a parent.
+*/
+QMediaAvailabilityControl::QMediaAvailabilityControl(QObject *parent)
+    : QMediaControl(*new QMediaControlPrivate, parent)
+{
+}
+
+/*!
+    Destruct the availability control object.
+*/
+QMediaAvailabilityControl::~QMediaAvailabilityControl()
+{
+}
+
+
+/*!
+  \fn QtMultimedia::AvailabilityError QMediaAvailabilityControl::availability() const
+
+  Returns the current availability of this instance of the media service.
+  If the availability changes at run time (for example, some other media
+  client takes all media resources) the availabilityChanges() signal
+  should be emitted.
+*/
+
+
+/*!
+    \fn void QMediaAvailabilityControl::availabilityChanged(QtMultimedia::AvailabilityError availability)
+
+    Signal emitted when the current \a availability value changed.
+*/
+
+#include "moc_qmediaavailabilitycontrol.cpp"
+QT_END_NAMESPACE
diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h
new file mode 100644
index 000000000..4b0b8a024
--- /dev/null
+++ b/src/multimedia/controls/qmediaavailabilitycontrol.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** 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 QMEDIAAVAILABILITYCONTROL_H
+#define QMEDIAAVAILABILITYCONTROL_H
+
+#include <qmediacontrol.h>
+#include <qmediaobject.h>
+#include <qtmedianamespace.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Multimedia)
+
+class Q_MULTIMEDIA_EXPORT QMediaAvailabilityControl : public QMediaControl
+{
+    Q_OBJECT
+
+public:
+    ~QMediaAvailabilityControl();
+
+    virtual QtMultimedia::AvailabilityError availability() const = 0;
+
+signals:
+    void availabilityChanged(QtMultimedia::AvailabilityError availability);
+
+protected:
+    QMediaAvailabilityControl(QObject* parent = 0);
+};
+
+#define QMediaAvailabilityControl_iid "com.nokia.Qt.QMediaAvailabilityControl/1.0"
+Q_MEDIA_DECLARE_CONTROL(QMediaAvailabilityControl, QMediaAvailabilityControl_iid)
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QMEDIAAVAILABILITYCONTROL_H
diff --git a/src/multimedia/controls/qradiodatacontrol.cpp b/src/multimedia/controls/qradiodatacontrol.cpp
index 845b4a759..19656f6ec 100644
--- a/src/multimedia/controls/qradiodatacontrol.cpp
+++ b/src/multimedia/controls/qradiodatacontrol.cpp
@@ -94,18 +94,6 @@ QRadioDataControl::~QRadioDataControl()
 }
 
 /*!
-    \fn bool QRadioDataControl::isAvailable() const
-
-    Returns true if the radio service is ready to use.
-*/
-
-/*!
-    \fn QtMultimedia::AvailabilityError QRadioDataControl::availabilityError() const
-
-    Returns the error state of the radio service.
-*/
-
-/*!
     \fn QRadioData::Error QRadioDataControl::error() const
 
     Returns the error state of a radio data.
diff --git a/src/multimedia/controls/qradiodatacontrol.h b/src/multimedia/controls/qradiodatacontrol.h
index c44c6a193..11723f8c8 100644
--- a/src/multimedia/controls/qradiodatacontrol.h
+++ b/src/multimedia/controls/qradiodatacontrol.h
@@ -59,9 +59,6 @@ class Q_MULTIMEDIA_EXPORT QRadioDataControl : public QMediaControl
 public:
     ~QRadioDataControl();
 
-    virtual bool isAvailable() const = 0;
-    virtual QtMultimedia::AvailabilityError availabilityError() const = 0;
-
     virtual QString stationId() const = 0;
     virtual QRadioData::ProgramType programType() const = 0;
     virtual QString programTypeName() const = 0;
diff --git a/src/multimedia/controls/qradiotunercontrol.cpp b/src/multimedia/controls/qradiotunercontrol.cpp
index c86a0a1cc..c0f3cc146 100644
--- a/src/multimedia/controls/qradiotunercontrol.cpp
+++ b/src/multimedia/controls/qradiotunercontrol.cpp
@@ -100,18 +100,6 @@ QRadioTunerControl::~QRadioTunerControl()
 }
 
 /*!
-    \fn bool QRadioTunerControl::isAvailable() const
-
-    Returns true if the radio service is ready to use.
-*/
-
-/*!
-    \fn QtMultimedia::AvailabilityError QRadioTunerControl::availabilityError() const
-
-    Returns the error state of the radio service.
-*/
-
-/*!
     \fn QRadioTuner::State QRadioTunerControl::state() const
 
     Returns the current radio tuner state.
@@ -235,7 +223,7 @@ QRadioTunerControl::~QRadioTunerControl()
 */
 
 /*!
-    \fn bool QRadioTunerControl::antennaConnected() const
+    \fn bool QRadioTunerControl::isAntennaConnected() const
 
     Identifies if there is an antenna connected to the device.
 
diff --git a/src/multimedia/controls/qradiotunercontrol.h b/src/multimedia/controls/qradiotunercontrol.h
index 354e9c2f1..2e64fbfaa 100644
--- a/src/multimedia/controls/qradiotunercontrol.h
+++ b/src/multimedia/controls/qradiotunercontrol.h
@@ -59,9 +59,6 @@ class Q_MULTIMEDIA_EXPORT QRadioTunerControl : public QMediaControl
 public:
     ~QRadioTunerControl();
 
-    virtual bool isAvailable() const = 0;
-    virtual QtMultimedia::AvailabilityError availabilityError() const = 0;
-
     virtual QRadioTuner::State state() const = 0;
 
     virtual QRadioTuner::Band band() const = 0;