Adding CallVolume interface support in ofono-qt Bindings Signed-off-by: Arun Ravindra...

diff --git a/lib/lib.pro b/lib/lib.pro
index 84f5b70..b47fa19 100644 (file)
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -29,6 +29,7 @@ PUBLIC_HEADERS += ofononetworkregistration.h
 PUBLIC_HEADERS += ofonosupplementaryservices.h
 PUBLIC_HEADERS += ofonovoicecallmanager.h
 PUBLIC_HEADERS += ofonovoicecall.h
+PUBLIC_HEADERS += ofonocallvolume.h
 
 HEADERS += $$PUBLIC_HEADERS
 HEADERS += ofonointerface.h 
@@ -51,7 +52,7 @@ SOURCES += ofononetworkregistration.cpp
 SOURCES += ofonosupplementaryservices.cpp
 SOURCES += ofonovoicecallmanager.cpp
 SOURCES += ofonovoicecall.cpp
-
+SOURCES += ofonocallvolume.cpp
 
 target.path = $$[QT_INSTALL_PREFIX]/lib
 headers.files = $$PUBLIC_HEADERS

diff --git a/lib/ofonocallvolume.cpp b/lib/ofonocallvolume.cpp
new file mode 100644 (file)
index 0000000..b099d21
--- /dev/null
+++ b/lib/ofonocallvolume.cpp
@@ -0,0 +1,95 @@
+/*
+ * This file is part of ofono-qt
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: Alexander Kanavin <alexander.kanavin@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <QtDBus/QtDBus>
+#include <QtCore/QObject>
+
+#include "ofonocallvolume.h"
+#include "ofonointerface.h"
+
+OfonoCallVolume::OfonoCallVolume(OfonoModem::SelectionSetting modemSetting, const QString &modemPath, QObject *parent)
+    : OfonoModemInterface(modemSetting, modemPath, "org.ofono.CallVolume", OfonoGetAllOnStartup, parent)
+{
+    connect(m_if, SIGNAL(propertyChanged(const QString&, const QVariant&)),
+            this, SLOT(propertyChanged(const QString&, const QVariant&)));
+
+    connect(m_if, SIGNAL(setPropertyFailed(const QString&)),
+            this, SLOT(setPropertyFailed(const QString&)));
+
+}
+
+OfonoCallVolume::~OfonoCallVolume()
+{
+}
+
+void OfonoCallVolume::propertyChanged(const QString &property, const QVariant &value)
+{
+    if (property == "SpeakerVolume") {
+        emit speakerVolumeChanged(value.value<quint8>());
+    } else if (property == "MicrophoneVolume") {
+        emit microphoneVolumeChanged(value.value<quint8>());
+    } else if (property == "Muted") {
+        emit mutedChanged(value.value<bool>());
+    }
+}
+
+quint8 OfonoCallVolume::speakerVolume() const
+{
+    return m_if->properties()["SpeakerVolume"].value<quint8>();
+}
+
+quint8 OfonoCallVolume::microphoneVolume() const
+{
+    return m_if->properties()["MicrophoneVolume"].value<quint8>();
+}
+
+bool OfonoCallVolume::muted() const
+{
+    return m_if->properties()["Muted"].value<bool>();
+}
+
+void OfonoCallVolume::setMuted(const bool value)
+{
+    m_if->setProperty("Muted",QVariant(value));
+}
+
+void OfonoCallVolume::setPropertyFailed(const QString &property)
+{
+    if (property == "SpeakerVolume") {
+        emit setSpeakerVolumeFailed();
+    } else if (property == "MicrophoneVolume") {
+        emit setMicrophoneVolumeFailed();
+    } else if (property == "Muted") {
+        emit setMutedFailed();
+    }
+}
+
+void OfonoCallVolume::setSpeakerVolume(const quint8 &spvolume)
+{
+    m_if->setProperty("SpeakerVolume",qVariantFromValue(spvolume));
+}
+
+void OfonoCallVolume::setMicrophoneVolume(const quint8 &mpvolume)
+{
+    m_if->setProperty("MicrophoneVolume",qVariantFromValue(mpvolume));
+}

diff --git a/lib/ofonocallvolume.h b/lib/ofonocallvolume.h
new file mode 100644 (file)
index 0000000..e08b937
--- /dev/null
+++ b/lib/ofonocallvolume.h
@@ -0,0 +1,68 @@
+/*
+ * This file is part of ofono-qt
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: Alexander Kanavin <alexander.kanavin@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef OFONOCALLVOLUME_H
+#define OFONOCALLVOLUME_H
+
+#include <QtCore/QObject>
+#include "ofonomodeminterface.h"
+#include "libofono-qt_global.h"
+
+//! This class is used to access oFono call volume API
+/*!
+ * The API is documented in
+ * http://git.kernel.org/?p=network/ofono/ofono.git;a=blob_plain;f=doc/call-volume-api.txt
+ */
+class OFONO_QT_EXPORT OfonoCallVolume : public OfonoModemInterface
+{
+    Q_OBJECT
+
+public:
+    OfonoCallVolume(OfonoModem::SelectionSetting modemSetting, const QString &modemPath, QObject *parent=0);
+    ~OfonoCallVolume();
+
+    /* Properties */
+    bool muted() const;
+    quint8 speakerVolume() const;
+    quint8 microphoneVolume()const ;
+
+    void setMuted(const bool mute);
+    void setSpeakerVolume(const quint8 &spvolume);
+    void setMicrophoneVolume(const quint8 &mpvolume);
+
+signals:
+
+    void mutedChanged(const bool &muted);
+    void speakerVolumeChanged(const quint8 &volume);
+    void microphoneVolumeChanged(const quint8 &mvolume);
+    void setMutedFailed();
+    void setSpeakerVolumeFailed();
+    void setMicrophoneVolumeFailed();
+
+private slots:
+    void propertyChanged(const QString& property, const QVariant& value);
+    void setPropertyFailed(const QString& property);
+
+};
+
+#endif // OFONOCALLVOLUME_H

diff --git a/tests/test_ofonocallvolume.cpp b/tests/test_ofonocallvolume.cpp
new file mode 100644 (file)
index 0000000..fa4fc8b
--- /dev/null
+++ b/tests/test_ofonocallvolume.cpp
@@ -0,0 +1,109 @@
+/*
+ * This file is part of ofono-qt
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: Alexander Kanavin <alexander.kanavin@nokia.com>
+ * Author: Arun Ravindran <ext-arun.1.ravindran@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <QtTest/QtTest>
+#include <QtCore/QObject>
+
+#include <ofonocallvolume.h>
+
+#include <QtDebug>
+
+class TestOfonoCallVolume : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase()
+    {
+
+        m = new OfonoCallVolume(OfonoModem::ManualSelect, "/phonesim", this);
+        QCOMPARE(m->modem()->isValid(), true);
+
+        if (!m->modem()->powered()) {
+            m->modem()->setPowered(true);
+            QTest::qWait(5000);
+        }
+        if (!m->modem()->online()) {
+            m->modem()->setOnline(true);
+            QTest::qWait(5000);
+        }
+        QCOMPARE(m->isValid(), true);
+    }
+
+    void testOfonoCallVolume()
+    {
+
+        QSignalSpy mutedChanged(m, SIGNAL(mutedChanged(const bool)));
+        QSignalSpy speakerVolumeChanged(m, SIGNAL(speakerVolumeChanged(const quint8)));
+        QSignalSpy microphoneVolumeChanged(m, SIGNAL(microphoneVolumeChanged(const quint8)));
+        QSignalSpy spfail(m, SIGNAL(setSpeakerVolumeFailed()));
+        QSignalSpy mvfail(m, SIGNAL(setMicrophoneVolumeFailed()));
+
+        m->modem()->setPowered(false);
+        QTest::qWait(5000);
+        m->modem()->setPowered(true);
+        QTest::qWait(5000);
+        m->modem()->setOnline(true);
+        QTest::qWait(5000);
+
+        m->setMuted(true);
+        QTest::qWait(2000);
+        QCOMPARE(mutedChanged.count(), 1);
+        QVERIFY(mutedChanged.takeFirst().at(0).toBool()==bool(true));
+        QVERIFY(m->muted()==bool(true));
+
+        m->setMuted(false);
+        QTest::qWait(2000);
+        QCOMPARE(mutedChanged.count(), 1);
+        QVERIFY(mutedChanged.takeFirst().at(0).toBool()==bool(false));
+        QVERIFY(m->muted()==bool(false));
+
+
+        m->setSpeakerVolume(quint8(15));
+        QTest::qWait(2000);
+        QCOMPARE(speakerVolumeChanged.count(), 1);
+        QCOMPARE(quint8(speakerVolumeChanged.takeFirst().at(0).toUInt()), quint8(15));
+        QCOMPARE(m->speakerVolume(),quint8(15));
+
+        m->setSpeakerVolume(quint8(250));
+        QTest::qWait(2000);
+        QCOMPARE(spfail.count(), 1);
+
+        m->setMicrophoneVolume(quint8(10));
+        QTest::qWait(2000);
+        QCOMPARE(mvfail.count(), 1);
+
+    }
+    void cleanupTestCase()
+    {
+
+    }
+
+
+private:
+    OfonoCallVolume *m;
+};
+
+QTEST_MAIN(TestOfonoCallVolume)
+#include "test_ofonocallvolume.moc"

diff --git a/tests/test_ofonocallvolume.pro b/tests/test_ofonocallvolume.pro
new file mode 100644 (file)
index 0000000..43e7fc6
--- /dev/null
+++ b/tests/test_ofonocallvolume.pro
@@ -0,0 +1,2 @@
+include(testcase.pri)
+SOURCES += test_ofonocallvolume.cpp

diff --git a/tests/tests.pro b/tests/tests.pro
index 7bd8cba..448d22f 100644 (file)
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -17,3 +17,4 @@ SUBDIRS += test_ofononetworkregistration.pro
 SUBDIRS += test_ofonosupplementaryservices.pro
 SUBDIRS += test_ofonovoicecallmanager.pro
 SUBDIRS += test_ofonovoicecall.pro
+SUBDIRS += test_ofonocallvolume.pro