Merge lp:~tiagosh/telepathy-ofono/audioflinger-speakermode into lp:telepathy-ofono

[Tiago Salem Herrmann]

- Implement support for audioflingler when compiling for armhf
- Implement speaker mode.

- Add support for audioflingler when compiling for armhf
- Implement speaker mode.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-amd64-ci/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-armhf-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/telepathy-ofono-ci/6/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-amd64-ci/2
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-armhf-ci/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/telepathy-ofono-ci/7/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/telepathy-ofono-ci/8/rebuild

review: Approve (continuous-integration)

[lp:~tiagosh/telepathy-ofono/audioflinger-speakermode]

36. By Tiago Salem Herrmann on 2013-08-08

enable speaker phone mode on incoming calls.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/telepathy-ofono-ci/9/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-05-08 13:51:52 +0000
+++ CMakeLists.txt	2013-08-08 16:24:30 +0000
@@ -11,6 +11,12 @@
 find_package(Qt5DBus)
 add_definitions(-DQT_NO_KEYWORDS)
 
+check_include_file_cxx("waudio.h" USE_AUDIOFLINGER)
+if (USE_AUDIOFLINGER)
+    add_definitions(-DUSE_AUDIOFLINGER)
+    set(WAUDIO_LIBRARIES -lwaudio)
+endif (USE_AUDIOFLINGER)
+
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(TP_QT5 REQUIRED TelepathyQt5)
 
@@ -33,7 +39,7 @@
 add_executable(telepathy-ofono main.cpp protocol.cpp connection.cpp ofonotextchannel.cpp ofonocallchannel.cpp voicemailiface.cpp speakeriface.cpp)
 qt5_use_modules(telepathy-ofono Core DBus)
 
-target_link_libraries(telepathy-ofono ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES} -ltelepathy-qt5 ${TELEPATHY_QT5_SERVICE_LIBRARIES} ${OFONO_QT_LIBRARIES})
+target_link_libraries(telepathy-ofono ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES} ${WAUDIO_LIBRARIES} -ltelepathy-qt5 ${TELEPATHY_QT5_SERVICE_LIBRARIES} ${OFONO_QT_LIBRARIES})
 install(TARGETS telepathy-ofono DESTINATION ${DAEMON_DIR})
 
 configure_file(ofono.service.in org.freedesktop.Telepathy.ConnectionManager.ofono.service)

=== modified file 'connection.cpp'
--- connection.cpp	2013-06-01 01:50:34 +0000
+++ connection.cpp	2013-08-08 16:24:30 +0000
@@ -30,6 +30,64 @@
 #include "phoneutils.h"
 #include "protocol.h"
 
+// audioflinger
+#ifdef USE_AUDIOFLINGER
+#include <waudio.h>
+#endif
+
+static void enable_earpiece()
+{
+#ifdef USE_AUDIOFLINGER
+    char parameter[20];
+    int i;
+    /* Set the call mode in AudioFlinger */
+    AudioSystem_setMode(AUDIO_MODE_IN_CALL);
+    sprintf(parameter, "routing=%d", AUDIO_DEVICE_OUT_EARPIECE);
+    /* Try the first 3 threads, as this is not fixed and there's no easy
+     * way to retrieve the default thread/output from Android */
+    for (i = 1; i <= 3; i++) {
+        if (AudioSystem_setParameters(i, parameter) >= 0)
+            break;
+    }
+#endif
+}
+
+static void enable_normal()
+{
+#ifdef USE_AUDIOFLINGER
+    char parameter[20];
+    int i;
+    /* Set normal mode in AudioFlinger */
+    AudioSystem_setMode(AUDIO_MODE_NORMAL);
+    /* Get device back to speaker mode, as by default in_call
+     * mode sets up device out to earpiece */
+    sprintf(parameter, "routing=%d", AUDIO_DEVICE_OUT_SPEAKER);
+    /* Try the first 3 threads, as this is not fixed and there's no easy
+     * way to retrieve the default thread/output from Android */
+    for (i = 1; i <= 3; i++) {
+        if (AudioSystem_setParameters(i, parameter) >= 0)
+            break;
+    }
+#endif
+}
+
+static void enable_speaker()
+{
+#ifdef USE_AUDIOFLINGER
+    char parameter[20];
+    int i;
+    /* Set the call mode in AudioFlinger */
+    AudioSystem_setMode(AUDIO_MODE_IN_CALL);
+    sprintf(parameter, "routing=%d", AUDIO_DEVICE_OUT_SPEAKER);
+    /* Try the first 3 threads, as this is not fixed and there's no easy
+     * way to retrieve the default thread/output from Android */
+    for (i = 1; i <= 3; i++) {
+        if (AudioSystem_setParameters(i, parameter) >= 0)
+            break;
+    }
+#endif
+}
+
 // miliseconds
 #define OFONO_REGISTER_RETRY_TIME 5000
 
@@ -45,7 +103,8 @@
     mOfonoNetworkRegistration(new OfonoNetworkRegistration(OfonoModem::AutomaticSelect, "")),
     mOfonoMessageWaiting(new OfonoMessageWaiting(OfonoModem::AutomaticSelect, "")),
     mHandleCount(0),
-    mRegisterTimer(new QTimer(this))
+    mRegisterTimer(new QTimer(this)),
+    mSpeakerMode(false)
 {
     setSelfHandle(newHandle("<SelfHandle>"));
 
@@ -138,6 +197,10 @@
     QObject::connect(mOfonoMessageWaiting, SIGNAL(voicemailWaitingChanged(bool)), voicemailIface.data(), SLOT(setVoicemailIndicator(bool)));
 
     QObject::connect(mRegisterTimer, SIGNAL(timeout()), SLOT(onTryRegister()));
+
+    // update audio route
+    QObject::connect(mOfonoVoiceCallManager, SIGNAL(callAdded(QString,QVariantMap)), SLOT(updateAudioRoute()));
+    QObject::connect(mOfonoVoiceCallManager, SIGNAL(callRemoved(QString)), SLOT(updateAudioRoute()));
 }
 
 oFonoConnection::~oFonoConnection() {
@@ -537,3 +600,48 @@
 {
     return mOfonoMessageWaiting->voicemailWaiting();
 }
+
+bool oFonoConnection::speakerMode()
+{
+    return mSpeakerMode;
+}
+
+void oFonoConnection::setSpeakerMode(bool active)
+{
+    if (mSpeakerMode != active) {
+        mSpeakerMode = active;
+        updateAudioRoute();
+        Q_EMIT speakerModeChanged(active);
+    }
+}
+
+void oFonoConnection::updateAudioRoute()
+{
+    int currentCalls = mOfonoVoiceCallManager->getCalls().size();
+    if (currentCalls != 0) {
+        if (currentCalls == 1) {
+            // if we have only one call, check if it's incoming and
+            // enable speaker mode so the ringtone is audible
+            OfonoVoiceCall *call = new OfonoVoiceCall(mOfonoVoiceCallManager->getCalls().first());
+            if (call) {
+                if (call->state() == "incoming") {
+                    enable_speaker();
+                    call->deleteLater();
+                    return;
+                }
+                call->deleteLater();
+            }
+        }
+        if(mSpeakerMode) {
+            enable_speaker();
+        } else {
+            enable_earpiece();
+        }
+    } else {
+        enable_normal();
+        setSpeakerMode(false);
+    }
+
+}
+
+

=== modified file 'connection.h'
--- connection.h	2013-06-01 01:50:34 +0000
+++ connection.h	2013-08-08 16:24:30 +0000
@@ -42,6 +42,7 @@
 #include "ofonotextchannel.h"
 #include "ofonocallchannel.h"
 #include "voicemailiface.h"
+#include "speakeriface.h"
 
 class oFonoConnection;
 class oFonoTextChannel;
@@ -65,6 +66,8 @@
     uint setPresence(const QString& status, const QString& statusMessage, Tp::DBusError *error);
     void connect(Tp::DBusError *error);
     void setOnline(bool online);
+    void setSpeakerMode(bool active);
+    bool speakerMode();
     bool voicemailIndicator(Tp::DBusError *error);
     QString voicemailNumber(Tp::DBusError *error);
     uint voicemailCount(Tp::DBusError *error);
@@ -86,8 +89,12 @@
                                          uint targetHandle, Tp::DBusError *error);
 
     ~oFonoConnection();
+Q_SIGNALS:
+    void speakerModeChanged(bool active);
+
 public Q_SLOTS:
     void Q_DBUS_EXPORT onTryRegister();
+    void updateAudioRoute();
 
 private Q_SLOTS:
     void onOfonoIncomingMessage(const QString &message, const QVariantMap &info);
@@ -97,7 +104,6 @@
     void onCallChannelClosed();
     void onValidityChanged(bool valid);
 
-
 private:
     bool isNetworkRegistered();
     QMap<uint, QString> mHandles;
@@ -116,6 +122,7 @@
     Tp::SimplePresence mSelfPresence;
     Tp::SimplePresence mRequestedSelfPresence;
     QTimer *mRegisterTimer;
+    bool mSpeakerMode;
 };
 
 #endif

=== modified file 'debian/control'
--- debian/control	2013-06-13 17:32:47 +0000
+++ debian/control	2013-08-08 16:24:30 +0000
@@ -6,6 +6,7 @@
                debhelper (>= 9),
                libofono-qt-dev (>= 1.5),
                libtelepathy-qt5-dev (>= 0.9.3),
+               libwaudio1-dev [armhf],
                qt5-default (>= 5.0),
                qtbase5-dev (>= 5.0),
 Standards-Version: 3.9.4

=== modified file 'ofonocallchannel.cpp'
--- ofonocallchannel.cpp	2013-06-01 01:50:34 +0000
+++ ofonocallchannel.cpp	2013-08-08 16:24:30 +0000
@@ -59,8 +59,7 @@
 
 void oFonoCallChannel::onTurnOnSpeaker(bool active, Tp::DBusError *error)
 {
-    // TODO - set modem speaker on.
-    //mSpeakerIface->setSpeakerMode(active);
+    mConnection->setSpeakerMode(active);
 }
 
 void oFonoCallChannel::onHangup(uint reason, const QString &detailedReason, const QString &message, Tp::DBusError *error)
@@ -118,6 +117,9 @@
     QObject::connect(mBaseChannel.data(), SIGNAL(closed()), this, SLOT(deleteLater()));
     QObject::connect(mConnection->callVolume(), SIGNAL(mutedChanged(bool)), SLOT(onOfonoMuteChanged(bool)));
     QObject::connect(this, SIGNAL(stateChanged(QString)), SLOT(onOfonoCallStateChanged(QString)));
+    QObject::connect(mConnection, SIGNAL(speakerModeChanged(bool)), mSpeakerIface.data(), SLOT(setSpeakerMode(bool)));
+
+    mSpeakerIface->setSpeakerMode(mConnection->speakerMode());
 }
 
 void oFonoCallChannel::onOfonoMuteChanged(bool mute)
@@ -211,5 +213,7 @@
     } else if (state == "waiting") {
         qDebug() << "waiting";
     }
+    // always update the audio route when call state changes
+    mConnection->updateAudioRoute();
     mPreviousState = state;
 }