summaryrefslogtreecommitdiff
path: root/media/base/mediachannel.h
diff options
context:
space:
mode:
authorwu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-10-16 18:12:02 +0000
committerwu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-10-16 18:12:02 +0000
commitcc712021a90cc93a68b4e65930cd0a0ad0a88d4e (patch)
tree1837dbe24add3e7e31f97a4de4af4f65c92b0f6b /media/base/mediachannel.h
parentbf0b532d27e61fa4442c138a945e2412854353b3 (diff)
downloadtalk-cc712021a90cc93a68b4e65930cd0a0ad0a88d4e.tar.gz
Update talk to 54898858.
TEST=try bots TBR=mallinath Review URL: https://webrtc-codereview.appspot.com/2414004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@4979 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/base/mediachannel.h')
-rw-r--r--media/base/mediachannel.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h
index 7431bc1..f90265c 100644
--- a/media/base/mediachannel.h
+++ b/media/base/mediachannel.h
@@ -50,6 +50,10 @@ class RateLimiter;
class Timing;
}
+namespace webrtc {
+struct DataChannelInit;
+}
+
namespace cricket {
class AudioRenderer;
@@ -980,6 +984,11 @@ class DataMediaChannel : public MediaChannel {
// Signal when the media channel is ready to send the stream. Arguments are:
// writable(bool)
sigslot::signal1<bool> SignalReadyToSend;
+ // Signal for notifying when a new stream is added from the remote side. Used
+ // for the in-band negotioation through the OPEN message for SCTP data
+ // channel.
+ sigslot::signal2<const std::string&, const webrtc::DataChannelInit&>
+ SignalNewStreamReceived;
};
} // namespace cricket