* simplify QXmppCall states

* improve call termination
* add a signal to notify user of audio channel state changes

1 files changed, 61 insertions, 73 deletions

diff --git a/src/QXmppCallManager.cpp b/src/QXmppCallManager.cpp
index 36b219d7..30b831cb 100644
--- a/src/QXmppCallManager.cpp
+++ b/src/QXmppCallManager.cpp
@@ -65,6 +65,7 @@ public:
     bool sendAck(const QXmppJingleIq &iq);
     bool sendInvite();
     bool sendRequest(const QXmppJingleIq &iq);
+    void terminate(QXmppJingleIq::Reason::Type reasonType);
 
     QXmppCall::Direction direction;
     QString jid;
@@ -103,7 +104,7 @@ private:
 };
 
 QXmppCallPrivate::QXmppCallPrivate(QXmppCall *qq)
-    : state(QXmppCall::OfferState),
+    : state(QXmppCall::ConnectingState),
     audioMode(QIODevice::NotOpen),
     videoMode(QIODevice::NotOpen),
     q(qq)
@@ -137,7 +138,7 @@ void QXmppCallPrivate::handleAck(const QXmppIq &ack)
 
             // handle termination
             if (request.action() == QXmppJingleIq::SessionTerminate)
-                q->terminate();
+                q->terminated();
             return;
         }
     }
@@ -186,20 +187,12 @@ void QXmppCallPrivate::handleRequest(const QXmppJingleIq &iq)
             !handleTransport(stream, iq.content())) {
 
             // terminate call
-            QXmppJingleIq iq;
-            iq.setTo(q->jid());
-            iq.setType(QXmppIq::Set);
-            iq.setAction(QXmppJingleIq::SessionTerminate);
-            iq.setSid(q->sid());
-            iq.reason().setType(QXmppJingleIq::Reason::FailedApplication);
-            sendRequest(iq);
-
-            q->terminate();
+            terminate(QXmppJingleIq::Reason::FailedApplication);
             return;
         }
 
         // check for call establishment
-        setState(QXmppCall::ConnectingState);
+        setState(QXmppCall::ActiveState);
         q->updateOpenMode();
 
     } else if (iq.action() == QXmppJingleIq::SessionInfo) {
@@ -214,7 +207,7 @@ void QXmppCallPrivate::handleRequest(const QXmppJingleIq &iq)
 
         // terminate
         q->info(QString("Remote party %1 terminated call %2").arg(iq.from(), iq.sid()));
-        q->terminate();
+        q->terminated();
 
     } else if (iq.action() == QXmppJingleIq::ContentAccept) {
 
@@ -420,9 +413,34 @@ void QXmppCallPrivate::setState(QXmppCall::State newState)
     {
         state = newState;
         emit q->stateChanged(state);
+
+        if (state == QXmppCall::ActiveState)
+            emit q->connected();
     }
 }
 
+/// Request graceful call termination
+
+void QXmppCallPrivate::terminate(QXmppJingleIq::Reason::Type reasonType)
+{
+    if (state == QXmppCall::DisconnectingState ||
+        state == QXmppCall::FinishedState)
+        return;
+
+    // hangup call
+    QXmppJingleIq iq;
+    iq.setTo(jid);
+    iq.setType(QXmppIq::Set);
+    iq.setAction(QXmppJingleIq::SessionTerminate);
+    iq.setSid(sid);
+    iq.reason().setType(reasonType);
+    sendRequest(iq);
+    setState(QXmppCall::DisconnectingState);
+
+    // schedule forceful termination in 5s
+    QTimer::singleShot(5000, q, SLOT(terminated()));
+}
+
 QXmppCall::QXmppCall(const QString &jid, QXmppCall::Direction direction, QXmppCallManager *parent)
     : QXmppLoggable(parent)
 {
@@ -451,7 +469,7 @@ QXmppCall::~QXmppCall()
 
 void QXmppCall::accept()
 {
-    if (d->direction == IncomingDirection && d->state == OfferState)
+    if (d->direction == IncomingDirection && d->state == ConnectingState)
     {
         Q_ASSERT(d->streams.size() == 1);
         QXmppCallPrivate::Stream *stream = d->streams.first();
@@ -480,7 +498,7 @@ void QXmppCall::accept()
         d->sendRequest(iq);
 
         // check for call establishment
-        d->setState(QXmppCall::ConnectingState);
+        d->setState(QXmppCall::ActiveState);
         updateOpenMode();
     }
 }
@@ -508,24 +526,17 @@ QXmppRtpVideoChannel *QXmppCall::videoChannel() const
     return (QXmppRtpVideoChannel*)stream->channel;
 }
 
-void QXmppCall::terminate()
+void QXmppCall::terminated()
 {
-    if (d->state == FinishedState)
-        return;
-
-    d->state = QXmppCall::FinishedState;
-
+    // close streams
     foreach (QXmppCallPrivate::Stream *stream, d->streams) {
         stream->channel->close();
         stream->connection->close();
     }
 
-    // emit signals later
-    QTimer::singleShot(0, this, SLOT(terminated()));
-}
-
-void QXmppCall::terminated()
-{
+    // update state
+    d->state = QXmppCall::FinishedState;
+    updateOpenMode();
     emit stateChanged(d->state);
     emit finished();
 }
@@ -543,27 +554,7 @@ QXmppCall::Direction QXmppCall::direction() const
 
 void QXmppCall::hangup()
 {
-    if (d->state == QXmppCall::DisconnectingState ||
-        d->state == QXmppCall::FinishedState)
-        return;
-
-    // hangup up call
-    QXmppJingleIq iq;
-    iq.setTo(d->jid);
-    iq.setType(QXmppIq::Set);
-    iq.setAction(QXmppJingleIq::SessionTerminate);
-    iq.setSid(d->sid);
-    d->sendRequest(iq);
-
-    // close streams
-    foreach (QXmppCallPrivate::Stream *stream, d->streams) {
-        stream->channel->close();
-        stream->connection->close();
-    }
-
-    // schedule forceful termination in 5s
-    QTimer::singleShot(5000, this, SLOT(terminate()));
-    d->setState(QXmppCall::DisconnectingState);
+    d->terminate(QXmppJingleIq::Reason::None);
 }
 
 /// Sends a transport-info to inform the remote party of new local candidates.
@@ -587,7 +578,6 @@ void QXmppCall::localCandidatesChanged()
     iq.setTo(d->jid);
     iq.setType(QXmppIq::Set);
     iq.setAction(QXmppJingleIq::TransportInfo);
-    iq.setInitiator(d->ownJid);
     iq.setSid(d->sid);
 
     iq.content().setCreator(stream->creator);
@@ -612,24 +602,24 @@ QString QXmppCall::jid() const
 
 void QXmppCall::updateOpenMode()
 {
+    QXmppCallPrivate::Stream *stream;
+    QIODevice::OpenMode mode;
+
     // determine audio mode
-    QXmppCallPrivate::Stream *stream = d->findStreamByMedia(AUDIO_MEDIA);
-    if (stream &&
-        (stream->channel->openMode() & QIODevice::ReadWrite) &&
-        stream->connection->isConnected() &&
-        d->state == ConnectingState)
-    {
-        d->setState(ActiveState);
-        emit connected();
+    mode = QIODevice::NotOpen;
+    stream = d->findStreamByMedia(AUDIO_MEDIA);
+    if (stream && stream->connection->isConnected())
+        mode = stream->channel->openMode() & QIODevice::ReadWrite;
+    if (mode != d->audioMode) {
+        d->audioMode = mode;
+        emit audioModeChanged(mode);
     }
-    
+
     // determine video mode
+    mode = QIODevice::NotOpen;
     stream = d->findStreamByMedia(VIDEO_MEDIA);
-    QIODevice::OpenMode mode = QIODevice::NotOpen;
-    if (stream) {
-        if (stream->connection->isConnected())
-            mode = stream->channel->openMode() & QIODevice::ReadWrite;
-    }
+    if (stream && stream->connection->isConnected())
+        mode = stream->channel->openMode() & QIODevice::ReadWrite;
     if (mode != d->videoMode) {
         d->videoMode = mode;
         emit videoModeChanged(mode);
@@ -655,13 +645,18 @@ QXmppCall::State QXmppCall::state() const
 
 void QXmppCall::startVideo()
 {
+    if (d->state != QXmppCall::ActiveState) {
+        warning("Cannot start video, call is not active");
+        return;
+    }
+
     QXmppCallPrivate::Stream *stream = d->findStreamByMedia(VIDEO_MEDIA);
     if (stream)
         return;
 
     // create video stream
     stream = d->createStream(VIDEO_MEDIA);
-    stream->creator = QLatin1String("initiator");
+    stream->creator = (d->direction == QXmppCall::OutgoingDirection) ? QLatin1String("initiator") : QLatin1String("responder");
     stream->name = QLatin1String("webcam");
     d->streams << stream;
 
@@ -670,7 +665,6 @@ void QXmppCall::startVideo()
     iq.setTo(d->jid);
     iq.setType(QXmppIq::Set);
     iq.setAction(QXmppJingleIq::ContentAdd);
-    iq.setInitiator(d->ownJid);
     iq.setSid(d->sid);
     iq.content().setCreator(stream->creator);
     iq.content().setName(stream->name);
@@ -835,14 +829,8 @@ void QXmppCallManager::jingleIqReceived(const QXmppJingleIq &iq)
             !call->d->handleTransport(stream, iq.content())) {
 
             // terminate call
-            QXmppJingleIq iq;
-            iq.setTo(call->jid());
-            iq.setType(QXmppIq::Set);
-            iq.setAction(QXmppJingleIq::SessionTerminate);
-            iq.setSid(call->sid());
-            iq.reason().setType(QXmppJingleIq::Reason::FailedApplication);
-            call->d->sendRequest(iq);
-
+            call->d->terminate(QXmppJingleIq::Reason::FailedApplication);
+            call->terminated();
             delete call;
             return;
         }