Merge pull request #64 from tswindell/master

[voicecall] Various updates to the telepathy provider plugin for VoIP/SIP support.

plugins/providers/telepathy/src/callchannelhandler.h

@@ -0,0 +1,100 @@
+/*
+ * This file is a part of the Voice Call Manager project
+ *
+ * Copyright (C) 2011-2015  Tom Swindell <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#ifndef CALLCHANNELHANDLER_H
+#define CALLCHANNELHANDLER_H
+
+#include <abstractvoicecallhandler.h>
+
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/CallContent>
+
+class TelepathyProvider;
+
+class CallChannelHandler : public AbstractVoiceCallHandler
+{
+    Q_OBJECT
+
+public:
+    explicit CallChannelHandler(const QString &id, Tp::CallChannelPtr channel, const QDateTime &userActionTime, TelepathyProvider *provider = 0);
+            ~CallChannelHandler();
+
+    /*** AbstractVoiceCallHandler Implementation ***/
+    AbstractVoiceCallProvider* provider() const;
+    QString handlerId() const;
+    QString lineId() const;
+    QDateTime startedAt() const;
+    int duration() const;
+    bool isIncoming() const;
+    bool isMultiparty() const;
+    bool isEmergency() const;
+    bool isForwarded() const;
+
+    VoiceCallStatus status() const;
+
+    /*** CallChannelHandler Implementation ***/
+    Tp::CallChannel channel() const;
+
+Q_SIGNALS:
+    /*** CallChannelHandler Implementation ***/
+    void error(const QString &errorMessage);
+    void invalidated(const QString &errorName, const QString &errorMessage);
+
+public Q_SLOTS:
+    /*** AbstractVoiceCallHandler Implementation ***/
+    void answer();
+    void hangup();
+    void hold(bool on);
+    void deflect(const QString &target);
+
+    void sendDtmf(const QString &tones);
+
+protected Q_SLOTS:
+    void onStatusChanged();
+
+    // CallChannel Interface Handling
+    void onCallChannelChannelReady(Tp::PendingOperation *op);
+    void onCallChannelChannelInvalidated(Tp::DBusProxy*,const QString &errorName, const QString &errorMessage);
+
+    void onCallChannelCallStateChanged(Tp::CallState state);
+
+    void onCallChannelCallContentAdded(Tp::CallContentPtr content);
+    void onCallChannelCallContentRemoved(Tp::CallContentPtr content, Tp::CallStateReason reason);
+    void onCallChannelCallLocalHoldStateChanged(Tp::LocalHoldState state,Tp::LocalHoldStateReason reason);
+
+    void onCallChannelAcceptCallFinished(Tp::PendingOperation *op);
+    void onCallChannelHangupCallFinished(Tp::PendingOperation *op);
+
+    // Telepathy Farstream Interface Handling
+    void onFarstreamCreateChannelFinished(Tp::PendingOperation *op);
+
+protected:
+    void timerEvent(QTimerEvent *event);
+
+private:
+    void setStatus(VoiceCallStatus newStatus);
+
+    class CallChannelHandlerPrivate *d_ptr;
+
+    Q_DISABLE_COPY(CallChannelHandler)
+    Q_DECLARE_PRIVATE(CallChannelHandler)
+};
+
+#endif // CALLCHANNELHANDLER_H

plugins/providers/telepathy/src/src.pro

@@ -8,13 +8,15 @@ PKGCONFIG += TelepathyQt5 TelepathyQt5Farstream
 HEADERS += \
     telepathyproviderplugin.h \
     telepathyprovider.h \
-    telepathyhandler.h \
-    farstreamchannel.h
+    farstreamchannel.h \
+    callchannelhandler.h \
+    streamchannelhandler.h
 
 SOURCES += \
     telepathyproviderplugin.cpp \
     telepathyprovider.cpp \
-    telepathyhandler.cpp \
-    farstreamchannel.cpp
+    farstreamchannel.cpp \
+    callchannelhandler.cpp \
+    streamchannelhandler.cpp
 
 DEFINES += PLUGIN_NAME=\\\"voicecall-telepathy-plugin\\\"