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>

tests/auto/unit/qmediaobject/qmediaobject.pro

@@ -3,5 +3,6 @@ TARGET = tst_qmediaobject
 QT += multimedia-private testlib
 
 include (../qmultimedia_common/mockrecorder.pri)
+include (../qmultimedia_common/mock.pri)
 
 SOURCES += tst_qmediaobject.cpp

tests/auto/unit/qmediaobject/tst_qmediaobject.cpp

@@ -53,12 +53,17 @@
 #include "mockmediarecorderservice.h"
 #include "mockmediaserviceprovider.h"
 #include "mockmetadatareadercontrol.h"
+#include "mockavailabilitycontrol.h"
 
-class QtTestMetaDataService : public QMediaService
+class QtTestMediaObjectService : public QMediaService
 {
     Q_OBJECT
 public:
-    QtTestMetaDataService(QObject *parent = 0):QMediaService(parent), metaDataRef(0), hasMetaData(true)
+    QtTestMediaObjectService(QObject *parent = 0, MockAvailabilityControl *availability = 0)
+        : QMediaService(parent)
+        , availabilityControl(availability)
+        , metaDataRef(0)
+        , hasMetaData(true)
     {
     }
 
@@ -66,6 +71,8 @@ public:
     {
         if (hasMetaData && qstrcmp(iid, QMetaDataReaderControl_iid) == 0)
             return &metaData;
+        else if (qstrcmp(iid, QMediaAvailabilityControl_iid) == 0)
+            return availabilityControl;
         else
             return 0;
     }
@@ -75,6 +82,7 @@ public:
     }
 
     MockMetaDataReaderControl metaData;
+    MockAvailabilityControl *availabilityControl;
     int metaDataRef;
     bool hasMetaData;
 };
@@ -329,7 +337,7 @@ void tst_QMediaObject::nullMetaDataControl()
     const QString titleKey(QLatin1String("Title"));
     const QString title(QLatin1String("Host of Seraphim"));
 
-    QtTestMetaDataService service;
+    QtTestMediaObjectService service;
     service.hasMetaData = false;
 
     QtTestMediaObject object(&service);
@@ -345,7 +353,7 @@ void tst_QMediaObject::nullMetaDataControl()
 
 void tst_QMediaObject::isMetaDataAvailable()
 {
-    QtTestMetaDataService service;
+    QtTestMediaObjectService service;
     service.metaData.setMetaDataAvailable(false);
 
     QtTestMediaObject object(&service);
@@ -367,7 +375,7 @@ void tst_QMediaObject::isMetaDataAvailable()
 
 void tst_QMediaObject::metaDataChanged()
 {
-    QtTestMetaDataService service;
+    QtTestMediaObjectService service;
     QtTestMediaObject object(&service);
 
     QSignalSpy changedSpy(&object, SIGNAL(metaDataChanged()));
@@ -408,7 +416,7 @@ void tst_QMediaObject::metaData()
     QFETCH(QString, title);
     QFETCH(QString, genre);
 
-    QtTestMetaDataService service;
+    QtTestMediaObjectService service;
     service.metaData.populateMetaData();
 
     QtTestMediaObject object(&service);
@@ -430,20 +438,64 @@ void tst_QMediaObject::metaData()
 
 void tst_QMediaObject::availability()
 {
-    QtTestMediaObject nullObject(0);
-    QCOMPARE(nullObject.isAvailable(), false);
-    QCOMPARE(nullObject.availabilityError(), QtMultimedia::ServiceMissingError);
+    {
+        QtTestMediaObject nullObject(0);
+        QCOMPARE(nullObject.isAvailable(), false);
+        QCOMPARE(nullObject.availabilityError(), QtMultimedia::ServiceMissingError);
+    }
 
-    QtTestMetaDataService service;
-    QtTestMediaObject object(&service);
-    QCOMPARE(object.isAvailable(), true);
-    QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
+    {
+        QtTestMediaObjectService service;
+        QtTestMediaObject object(&service);
+        QCOMPARE(object.isAvailable(), true);
+        QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
+    }
+
+    {
+        MockAvailabilityControl available(QtMultimedia::NoError);
+        QtTestMediaObjectService service(0, &available);
+        QtTestMediaObject object(&service);
+        QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool)));
+        QSignalSpy availabilityErrorSpy(&object, SIGNAL(availabilityChanged(bool)));
+
+        QCOMPARE(object.isAvailable(), true);
+        QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
+
+        available.setAvailability(QtMultimedia::BusyError);
+        QCOMPARE(object.isAvailable(), false);
+        QCOMPARE(object.availabilityError(), QtMultimedia::BusyError);
+        QCOMPARE(availabilitySpy.count(), 1);
+        QCOMPARE(availabilityErrorSpy.count(), 1);
+
+        available.setAvailability(QtMultimedia::NoError);
+        QCOMPARE(object.isAvailable(), true);
+        QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
+        QCOMPARE(availabilitySpy.count(), 2);
+        QCOMPARE(availabilityErrorSpy.count(), 2);
+    }
+
+    {
+        MockAvailabilityControl available(QtMultimedia::BusyError);
+        QtTestMediaObjectService service(0, &available);
+        QtTestMediaObject object(&service);
+        QSignalSpy availabilitySpy(&object, SIGNAL(availabilityChanged(bool)));
+        QSignalSpy availabilityErrorSpy(&object, SIGNAL(availabilityChanged(bool)));
+
+        QCOMPARE(object.isAvailable(), false);
+        QCOMPARE(object.availabilityError(), QtMultimedia::BusyError);
+
+        available.setAvailability(QtMultimedia::NoError);
+        QCOMPARE(object.isAvailable(), true);
+        QCOMPARE(object.availabilityError(), QtMultimedia::NoError);
+        QCOMPARE(availabilitySpy.count(), 1);
+        QCOMPARE(availabilityErrorSpy.count(), 1);
+    }
 }
 
  void tst_QMediaObject::service()
  {
      // Create the mediaobject with service.
-     QtTestMetaDataService service;
+     QtTestMediaObjectService service;
      QtTestMediaObject mediaObject1(&service);
 
      // Get service and Compare if it equal to the service passed as an argument in mediaObject1.

tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp

@@ -1059,17 +1059,55 @@ void tst_QMediaRecorder::testAudioSettingsDestructor()
 /* availabilityError() API test. */
 void tst_QMediaRecorder::testAvailabilityError()
 {
-    MockMediaRecorderService service(0, 0);
-    MockMediaObject object(0, &service);
-    QMediaRecorder recorder(&object);
-    QCOMPARE(recorder.availabilityError(), QtMultimedia::ServiceMissingError);
+    {
+        MockMediaRecorderService service(0, 0);
+        MockMediaObject object(0, &service);
+        QMediaRecorder recorder(&object);
+        QCOMPARE(recorder.availabilityError(), QtMultimedia::ServiceMissingError);
+        QCOMPARE(recorder.isAvailable(), false);
+    }
+    {
+        MockMediaRecorderControl recorderControl(0);
+        MockMediaRecorderService service1(0, &recorderControl);
+        service1.mockMetaDataControl->populateMetaData();
+        MockMediaObject object1(0, &service1);
+        QMediaRecorder recorder1(&object1);
+        QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
+        QCOMPARE(recorder1.isAvailable(), true);
+    }
+    {
+        MockMediaRecorderControl recorderControl(0);
+        MockMediaRecorderService service1(0, &recorderControl, 0);
+        service1.mockMetaDataControl->populateMetaData();
+        MockMediaObject object1(0, &service1);
+        QMediaRecorder recorder1(&object1);
 
-    MockMediaRecorderControl recorderControl(0);
-    MockMediaRecorderService service1(0, &recorderControl);
-    service1.mockMetaDataControl->populateMetaData();
-    MockMediaObject object1(0, &service1);
-    QMediaRecorder recorder1(&object1);
-    QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
+        QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
+        QCOMPARE(recorder1.isAvailable(), true);
+    }
+    {
+        MockMediaRecorderControl recorderControl(0);
+        MockAvailabilityControl availability(QtMultimedia::NoError);
+        MockMediaRecorderService service1(0, &recorderControl, &availability);
+        service1.mockMetaDataControl->populateMetaData();
+        MockMediaObject object1(0, &service1);
+        QMediaRecorder recorder1(&object1);
+
+        QSignalSpy spy(&object1, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)));
+
+        QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
+        QCOMPARE(recorder1.isAvailable(), true);
+
+        availability.setAvailability(QtMultimedia::BusyError);
+        QCOMPARE(recorder1.availabilityError(), QtMultimedia::BusyError);
+        QCOMPARE(recorder1.isAvailable(), false);
+        QCOMPARE(spy.count(), 1);
+
+        availability.setAvailability(QtMultimedia::NoError);
+        QCOMPARE(recorder1.availabilityError(), QtMultimedia::NoError);
+        QCOMPARE(recorder1.isAvailable(), true);
+        QCOMPARE(spy.count(), 2);
+    }
 }
 
 /* isAvailable() API test. */

tests/auto/unit/qmultimedia_common/mock.pri

@@ -4,4 +4,5 @@ INCLUDEPATH += $$PWD \
 HEADERS *= \
     ../qmultimedia_common/mockmediaserviceprovider.h \
     ../qmultimedia_common/mockmediaservice.h \
-    ../qmultimedia_common/mockmediaobject.h
+    ../qmultimedia_common/mockmediaobject.h \
+    ../qmultimedia_common/mockavailabilitycontrol.h

tests/auto/unit/qmultimedia_common/mockavailabilitycontrol.h

@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the test suite 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 MOCKAVAILABILITYCONTROL_H
+#define MOCKAVAILABILITYCONTROL_H
+
+#include <qmediaavailabilitycontrol.h>
+
+class MockAvailabilityControl : public QMediaAvailabilityControl
+{
+    Q_OBJECT
+
+public:
+    MockAvailabilityControl(QtMultimedia::AvailabilityError available)
+        : m_availability(available)
+    {
+
+    }
+
+    QtMultimedia::AvailabilityError availability() const
+    {
+        return m_availability;
+    }
+
+    void setAvailability(QtMultimedia::AvailabilityError availability)
+    {
+        if (m_availability != availability) {
+            m_availability = availability;
+            emit availabilityChanged(availability);
+        }
+    }
+
+    QtMultimedia::AvailabilityError m_availability;
+};
+
+#endif // MOCKAVAILABILITYCONTROL_H

tests/auto/unit/qmultimedia_common/mockmediarecorderservice.h

@@ -50,14 +50,16 @@
 #include "mockaudioendpointselector.h"
 #include "mockmediacontainercontrol.h"
 #include "mockmetadatawritercontrol.h"
+#include "mockavailabilitycontrol.h"
 
 class MockMediaRecorderService : public QMediaService
 {
     Q_OBJECT
 public:
-    MockMediaRecorderService(QObject *parent = 0, QMediaControl *control = 0):
+    MockMediaRecorderService(QObject *parent = 0, QMediaControl *control = 0, MockAvailabilityControl *availability = 0):
         QMediaService(parent),
         mockControl(control),
+        mockAvailabilityControl(availability),
         hasControls(true)
     {
         mockAudioEndpointSelector = new MockAudioEndpointSelector(parent);
@@ -81,6 +83,8 @@ public:
             return mockVideoEncoderControl;
         if (hasControls && qstrcmp(name, QMetaDataWriterControl_iid) == 0)
             return mockMetaDataControl;
+        if (hasControls && qstrcmp(name, QMediaAvailabilityControl_iid) == 0)
+            return mockAvailabilityControl;
 
         return 0;
     }
@@ -95,6 +99,8 @@ public:
     QMediaContainerControl     *mockFormatControl;
     QVideoEncoderControl    *mockVideoEncoderControl;
     MockMetaDataWriterControl *mockMetaDataControl;
+    MockAvailabilityControl *mockAvailabilityControl;
+
     bool hasControls;
 };
 

tests/auto/unit/qmultimedia_common/mockradiodatacontrol.h

@@ -57,15 +57,6 @@ public:
 
     using QRadioDataControl::error;
 
-    bool isAvailable() const
-    {
-        return true;
-    }
-    QtMultimedia::AvailabilityError availabilityError() const
-    {
-        return QtMultimedia::NoError;
-    }
-
     QRadioData::Error error() const
     {
         return m_err;

tests/auto/unit/qmultimedia_common/mockradiotunercontrol.h

@@ -66,15 +66,6 @@ public:
         return m_active ? QRadioTuner::ActiveState : QRadioTuner::StoppedState;
     }
 
-    bool isAvailable() const
-    {
-        return true;
-    }
-    QtMultimedia::AvailabilityError availabilityError() const
-    {
-        return QtMultimedia::NoError;
-    }
-
     QRadioTuner::Band band() const
     {
         return m_band;