summaryrefslogtreecommitdiff
path: root/tubes/inc
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-07-28 11:16:01 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-08-02 18:00:54 +0200
commit4311938f7e838c6263b0e5774e611ec213cb02c6 (patch)
tree2d1ffba0cb321b65165dcd90f9c34b97e4ec005b /tubes/inc
parent326235584f9dc17c0adf4c02180f45d4c3dc1e64 (diff)
tubes: impose strict ordering on 1-1 collaboration
- master (the one who started the session) echoes back packets from slave, who only then, after receiving own commands executes them Change-Id: I8b5a1d1bae0d665b65fe2ec0121430178728274d
Diffstat (limited to 'tubes/inc')
-rw-r--r--tubes/inc/tubes/conference.hxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index e5c5d370098b..6a026049237e 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -46,7 +46,11 @@ class TeleConference
{
public:
- TeleConference( TeleManager* pManager, TpAccount *pAccount, TpDBusTubeChannel* pChannel, const OString sUuid = OString() );
+ TeleConference( TeleManager* pManager,
+ TpAccount* pAccount,
+ TpDBusTubeChannel* pChannel,
+ const OString sUuid = OString(),
+ bool bMaster = false );
~TeleConference();
/// Close channel and call finalize()
@@ -80,6 +84,7 @@ public:
bool setTube( GDBusConnection* pTube );
void setTubeOfferedHandlerInvoked( bool b );
bool isTubeOfferedHandlerInvoked() const;
+ bool isMaster() const;
/** Queue incoming data as OString */
void queue( const OString& rPacket );
void setUuid( const OString& rUuid ) { msUuid = rUuid; }
@@ -97,6 +102,7 @@ private:
TpAccount* mpAccount;
TpDBusTubeChannel* mpChannel;
OString msUuid;
+ bool mbMaster;
TeleConferenceImpl* pImpl;
};