Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(428)

Unified Diff: talk/media/sctp/sctpdataengine.h

Issue 1315923003: Revert of Added send-thresholding and fixed text packet dumping. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | talk/media/sctp/sctpdataengine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/sctp/sctpdataengine.h
diff --git a/talk/media/sctp/sctpdataengine.h b/talk/media/sctp/sctpdataengine.h
index a591542bd676622a31e11bdabca3ce87dbcf97ee..86bfa37a48c10dca4c3f5b0cad9a330d27aea10e 100644
--- a/talk/media/sctp/sctpdataengine.h
+++ b/talk/media/sctp/sctpdataengine.h
@@ -64,8 +64,6 @@
// usrsctp.h)
const int kSctpDefaultPort = 5000;
-class SctpDataMediaChannel;
-
// A DataEngine that interacts with usrsctp.
//
// From channel calls, data flows like this:
@@ -90,7 +88,7 @@
// 14. SctpDataMediaChannel::SignalDataReceived(data)
// [from the same thread, methods registered/connected to
// SctpDataMediaChannel are called with the recieved data]
-class SctpDataEngine : public DataEngineInterface, public sigslot::has_slots<> {
+class SctpDataEngine : public DataEngineInterface {
public:
SctpDataEngine();
virtual ~SctpDataEngine();
@@ -99,15 +97,9 @@
virtual const std::vector<DataCodec>& data_codecs() { return codecs_; }
- static int SendThresholdCallback(struct socket* sock, uint32_t sb_free);
-
private:
- static std::vector<SctpDataMediaChannel*> channels_;
static int usrsctp_engines_count;
std::vector<DataCodec> codecs_;
-
- static SctpDataMediaChannel* GetChannelFromSocket(struct socket* sock);
- void OnChannelDestroyed(SctpDataMediaChannel *channel);
};
// TODO(ldixon): Make into a special type of TypedMessageData.
@@ -196,9 +188,6 @@
debug_name_ = debug_name;
}
const std::string& debug_name() const { return debug_name_; }
- const struct socket* socket() { return sock_; }
-
- sigslot::signal1<SctpDataMediaChannel*> SignalDestroyed;
private:
sockaddr_conn GetSctpSockAddr(int port);
« no previous file with comments | « no previous file | talk/media/sctp/sctpdataengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698