Merge lp:~tiagosh/telephony-service/waiting-tone into lp:telephony-service

[Tiago Salem Herrmann]

- Emit a sound feedback when all calls are ended
- Play a waiting tone instead of regular ringtone for waiting calls.

- Emit a sound feedback when all calls are ended
- Play a waiting tone instead of regular ringtone for waiting calls.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:951
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/320/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/136
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/136/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/137

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/320/rebuild

review: Approve (continuous-integration)

[lp:~tiagosh/telephony-service/waiting-tone]

952. By Tiago Salem Herrmann on 2014-10-16

play 3 bips only when remote side hangs up

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:952
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/321/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/137
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/137/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/138

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/321/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'approver/approver.cpp'
--- approver/approver.cpp	2014-07-22 10:57:54 +0000
+++ approver/approver.cpp	2014-10-16 17:05:00 +0000
@@ -30,6 +30,7 @@
 #include "ringtone.h"
 #include "callmanager.h"
 #include "callentry.h"
+#include "tonegenerator.h"
 
 #include <QContactAvatar>
 #include <QContactFetchRequest>
@@ -325,8 +326,12 @@
         g_error_free (error);
     }
 
-    // play a ringtone
-    Ringtone::instance()->playIncomingCallSound();
+    if (CallManager::instance()->hasCalls()) {
+        ToneGenerator::instance()->playWaitingTone();
+    } else {
+        // play a ringtone
+        Ringtone::instance()->playIncomingCallSound();
+    }
 
     if (!CallManager::instance()->hasCalls() && GreeterContacts::instance()->incomingCallVibrate()) {
         mVibrateEffect.setDuration(2000);
@@ -531,6 +536,7 @@
     }
 
     Ringtone::instance()->stopIncomingCallSound();
+    ToneGenerator::instance()->stopWaitingTone();
     mVibrateTimer.stop();
     // WORKAROUND: the ubuntu qt sensors backend does not support setPeriod() and stop(),
     // so we invoke a short vibration to simulate a stop() call

=== modified file 'handler/callhandler.cpp'
--- handler/callhandler.cpp	2014-09-05 19:02:25 +0000
+++ handler/callhandler.cpp	2014-10-16 17:05:00 +0000
@@ -319,6 +319,10 @@
     }
 
     mCallChannels.removeAll(channel);
+
+    if (mCallChannels.isEmpty()) {
+        ToneGenerator::instance()->playCallEndedTone();
+    }
 }
 
 void CallHandler::onCallStateChanged(Tp::CallState state)

=== modified file 'libtelephonyservice/tonegenerator.cpp'
--- libtelephonyservice/tonegenerator.cpp	2014-08-01 07:54:22 +0000
+++ libtelephonyservice/tonegenerator.cpp	2014-10-16 17:05:00 +0000
@@ -33,15 +33,17 @@
 #define TONEGEN_DBUS_IFACE_NAME TONEGEN_DBUS_SERVICE_NAME
 
 ToneGenerator::ToneGenerator(QObject *parent) :
-    QObject(parent), mPlaybackTimer(nullptr)
+    QObject(parent), mDTMFPlaybackTimer(nullptr), mWaitingPlaybackTimer(new QTimer(this))
 {
+    // the waiting tone is played in loop
+    connect(mWaitingPlaybackTimer, SIGNAL(timeout()), this, SLOT(playWaitingTone()));
+    mWaitingPlaybackTimer->setSingleShot(true);
 }
 
 ToneGenerator::~ToneGenerator()
 {
-    if (mPlaybackTimer && mPlaybackTimer->isActive()) {
-        this->stopDTMFTone();
-    }
+    this->stopDTMFTone();
+    this->stopWaitingTone();
 }
 
 ToneGenerator *ToneGenerator::instance()
@@ -50,21 +52,8 @@
     return self;
 }
 
-void ToneGenerator::playDTMFTone(uint key)
+bool ToneGenerator::startEventTone(uint key)
 {
-    if (!mPlaybackTimer) {
-        mPlaybackTimer = new QTimer(this);
-        mPlaybackTimer->setSingleShot(true);
-        connect(mPlaybackTimer, SIGNAL(timeout()), this, SLOT(stopDTMFTone()));
-    }
-    if (mPlaybackTimer->isActive()) {
-        qDebug() << "Already playing a tone, ignore.";
-        return;
-    }
-    if (key > 11) {
-        qDebug() << "Invalid DTMF tone, ignore.";
-        return;
-    }
     QDBusMessage startMsg = QDBusMessage::createMethodCall(
             TONEGEN_DBUS_SERVICE_NAME,
             TONEGEN_DBUS_OBJ_PATH,
@@ -75,12 +64,30 @@
     toneArgs << QVariant((int)0);  // volume is ignored
     toneArgs << QVariant((uint)0); // duration is ignored
     startMsg.setArguments(toneArgs);
-    if (QDBusConnection::sessionBus().send(startMsg)) {
-        mPlaybackTimer->start(DTMF_LOCAL_PLAYBACK_DURATION);
-    }
-}
-
-void ToneGenerator::stopDTMFTone()
+    return QDBusConnection::sessionBus().send(startMsg);
+}
+
+void ToneGenerator::playDTMFTone(uint key)
+{
+    if (!mDTMFPlaybackTimer) {
+        mDTMFPlaybackTimer = new QTimer(this);
+        mDTMFPlaybackTimer->setSingleShot(true);
+        connect(mDTMFPlaybackTimer, SIGNAL(timeout()), this, SLOT(stopDTMFTone()));
+    }
+    if (mDTMFPlaybackTimer->isActive()) {
+        qDebug() << "Already playing a tone, ignore.";
+        return;
+    }
+    if (key > 11) {
+        qDebug() << "Invalid DTMF tone, ignore.";
+        return;
+    }
+    if (startEventTone(key)) {
+        mDTMFPlaybackTimer->start(DTMF_LOCAL_PLAYBACK_DURATION);
+    }
+}
+
+void ToneGenerator::stopTone()
 {
     QDBusConnection::sessionBus().send(
         QDBusMessage::createMethodCall(
@@ -88,7 +95,36 @@
             TONEGEN_DBUS_OBJ_PATH,
             TONEGEN_DBUS_IFACE_NAME,
             "StopTone" ));
-    if (mPlaybackTimer) {
-        mPlaybackTimer->stop();
-    }
+}
+
+void ToneGenerator::stopDTMFTone()
+{
+    stopTone();
+    if (mDTMFPlaybackTimer) {
+        mDTMFPlaybackTimer->stop();
+    }
+
+}
+
+void ToneGenerator::playWaitingTone()
+{
+    if (mWaitingPlaybackTimer->isActive()) {
+        stopTone();
+    }
+
+    if (startEventTone((uint)79)) {
+        mWaitingPlaybackTimer->start(WAITING_PLAYBACK_DURATION);
+    }
+}
+
+void ToneGenerator::stopWaitingTone()
+{
+    stopTone();
+    mWaitingPlaybackTimer->stop();
+}
+
+void ToneGenerator::playCallEndedTone()
+{
+    startEventTone((uint)257);
+    QTimer::singleShot(2000, this, SLOT(stopTone()));
 }

=== modified file 'libtelephonyservice/tonegenerator.h'
--- libtelephonyservice/tonegenerator.h	2014-07-26 10:06:37 +0000
+++ libtelephonyservice/tonegenerator.h	2014-10-16 17:05:00 +0000
@@ -28,6 +28,7 @@
 class QTimer;
 
 static const int DTMF_LOCAL_PLAYBACK_DURATION = 200; /* in milliseconds */
+static const int WAITING_PLAYBACK_DURATION = 8000; /* in milliseconds */
 
 class ToneGenerator : public QObject
 {
@@ -41,13 +42,19 @@
      * Valid tones: 0..9 (number keys), 10 (*), 11 (#)
      */
     void playDTMFTone(uint key);
+    void playWaitingTone();
+    void stopWaitingTone();
+    void playCallEndedTone();
 
 private Q_SLOTS:
+    void stopTone();
     void stopDTMFTone();
+    bool startEventTone(uint key);
 
 private:
     explicit ToneGenerator(QObject *parent = 0);
-    QTimer* mPlaybackTimer;
+    QTimer* mDTMFPlaybackTimer;
+    QTimer* mWaitingPlaybackTimer;
 };
 
 #endif // TONEGENERATOR_H