summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordknn <yoann.blein@free.fr>2012-08-06 14:40:13 (GMT)
committerdknn <yoann.blein@free.fr>2012-09-22 09:32:38 (GMT)
commitd62f8088b8cc42417f97a3b5c3f99bf9288593d4 (patch)
tree46861355d40bfe5e18088496abc9654e0dbaa00c /Swiften
parent343f88e3048887e83cc91bb710510b3aa618f779 (diff)
downloadswift-contrib-d62f8088b8cc42417f97a3b5c3f99bf9288593d4.zip
swift-contrib-d62f8088b8cc42417f97a3b5c3f99bf9288593d4.tar.bz2
Add support for multiple sharing and control in chat view
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/ScreenSharing/IncomingScreenSharing.cpp1
-rw-r--r--Swiften/ScreenSharing/OutgoingScreenSharing.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/Swiften/ScreenSharing/IncomingScreenSharing.cpp b/Swiften/ScreenSharing/IncomingScreenSharing.cpp
index bbbfbad..15574c4 100644
--- a/Swiften/ScreenSharing/IncomingScreenSharing.cpp
+++ b/Swiften/ScreenSharing/IncomingScreenSharing.cpp
@@ -91,6 +91,7 @@ JingleContentID IncomingScreenSharing::getContentID() const
void IncomingScreenSharing::hangleNewImageDecoded(const Image& image)
{
+ onStateChange(ScreenSharing::Receiving);
onNewImageReceived(image);
}
diff --git a/Swiften/ScreenSharing/OutgoingScreenSharing.cpp b/Swiften/ScreenSharing/OutgoingScreenSharing.cpp
index 005e204..7cea50e 100644
--- a/Swiften/ScreenSharing/OutgoingScreenSharing.cpp
+++ b/Swiften/ScreenSharing/OutgoingScreenSharing.cpp
@@ -132,6 +132,7 @@ void OutgoingScreenSharing::startRTPSession()
encoder = new VP8Encoder(packetizer, width, height);
packetizer->onNewPayloadReady.connect(boost::bind(&OutgoingScreenSharing::handleNewPayloadReady, this, _1, _2));
onReady();
+ onStateChange(ScreenSharing::BroadCasting);
}
}