From 4311938f7e838c6263b0e5774e611ec213cb02c6 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Sat, 28 Jul 2012 11:16:01 +0200 Subject: 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 --- tubes/inc/tubes/conference.hxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'tubes/inc') 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; }; -- cgit