Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-12-25 14:39:48 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-05-11 10:22:56 (GMT) |
| commit | 927d62cc54c8a5087dba6b61afa9ad30dc528a23 (patch) | |
| tree | e67dc911bd30c0519d31a542d8e085bbb209879d /Swiften/Jingle/JingleSession.h | |
| parent | 17b188343e7208b875af7af30d94f0bf948f6b93 (diff) | |
| download | swift-927d62cc54c8a5087dba6b61afa9ad30dc528a23.zip swift-927d62cc54c8a5087dba6b61afa9ad30dc528a23.tar.bz2 | |
File Transfer refactoring.
Allocate S5B server lazily.
Forward forts lazily.
Various state machine fixes.
Temporarily disabling S5B proxy support.
Change-Id: I3145e85a99b15a7e457306bbfbe9c0eb570191e4
Diffstat (limited to 'Swiften/Jingle/JingleSession.h')
| -rw-r--r-- | Swiften/Jingle/JingleSession.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/Swiften/Jingle/JingleSession.h b/Swiften/Jingle/JingleSession.h index 150ad79..8307311 100644 --- a/Swiften/Jingle/JingleSession.h +++ b/Swiften/Jingle/JingleSession.h @@ -1,24 +1,26 @@ /* - * Copyright (c) 2011 Remko Tronçon + * Copyright (c) 2011-2013 Remko Tronçon * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ #pragma once +#include <string> +#include <vector> #include <boost/shared_ptr.hpp> #include <boost/optional.hpp> -#include <string> - +#include <Swiften/Base/Listenable.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/JID/JID.h> #include <Swiften/Elements/JinglePayload.h> namespace Swift { + class JingleSessionListener; class JingleContentID; - class JingleSession { + class JingleSession : public Listenable<JingleSessionListener> { public: typedef boost::shared_ptr<JingleSession> ref; @@ -32,26 +34,19 @@ namespace Swift { const std::string& getID() const { return id; } + virtual void sendInitiate(const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref) = 0; virtual void sendTerminate(JinglePayload::Reason::Type reason) = 0; virtual void sendInfo(boost::shared_ptr<Payload>) = 0; virtual void sendAccept(const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref = JingleTransportPayload::ref()) = 0; - virtual void sendTransportInfo(const JingleContentID&, JingleTransportPayload::ref) = 0; + virtual std::string sendTransportInfo(const JingleContentID&, JingleTransportPayload::ref) = 0; virtual void sendTransportAccept(const JingleContentID&, JingleTransportPayload::ref) = 0; virtual void sendTransportReject(const JingleContentID&, JingleTransportPayload::ref) = 0; virtual void sendTransportReplace(const JingleContentID&, JingleTransportPayload::ref) = 0; - public: - boost::signal<void (const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref)> onSessionAcceptReceived; - boost::signal<void (JinglePayload::ref)> onSessionInfoReceived; - boost::signal<void (boost::optional<JinglePayload::Reason>)> onSessionTerminateReceived; - boost::signal<void (const JingleContentID&, JingleTransportPayload::ref)> onTransportAcceptReceived; - boost::signal<void (const JingleContentID&, JingleTransportPayload::ref)> onTransportInfoReceived; - boost::signal<void (const JingleContentID&, JingleTransportPayload::ref)> onTransportRejectReceived; - boost::signal<void (const JingleContentID&, JingleTransportPayload::ref)> onTransportReplaceReceived; - private: JID initiator; std::string id; + std::vector<JingleSessionListener*> listeners; }; } |