| Index: talk/app/webrtc/webrtcsession.h
|
| diff --git a/talk/app/webrtc/webrtcsession.h b/talk/app/webrtc/webrtcsession.h
|
| index 6e4a9e92b459385054206325e925dc87ae5b4641..fd9cd2ca5569866decd86e9ad590d9b64dbcdf5a 100644
|
| --- a/talk/app/webrtc/webrtcsession.h
|
| +++ b/talk/app/webrtc/webrtcsession.h
|
| @@ -119,7 +119,7 @@ class WebRtcSession : public cricket::BaseSession,
|
| public DtmfProviderInterface,
|
| public DataChannelProviderInterface {
|
| public:
|
| - WebRtcSession(cricket::ChannelManager* channel_manager,
|
| + WebRtcSession(webrtc::MediaControllerInterface* media_controller,
|
| rtc::Thread* signaling_thread,
|
| rtc::Thread* worker_thread,
|
| cricket::PortAllocator* port_allocator,
|
| @@ -383,7 +383,11 @@ class WebRtcSession : public cricket::BaseSession,
|
|
|
| void ReportNegotiatedCiphers(const cricket::TransportStats& stats);
|
|
|
| - rtc::scoped_ptr<MediaControllerInterface> media_controller_;
|
| + void OnSentPacket(cricket::TransportChannel* channel,
|
| + const rtc::SentPacket& sent_packet);
|
| + void OnSentPacket_w(const rtc::SentPacket& sent_packet);
|
| +
|
| + MediaControllerInterface* media_controller_;
|
| rtc::scoped_ptr<cricket::VoiceChannel> voice_channel_;
|
| rtc::scoped_ptr<cricket::VideoChannel> video_channel_;
|
| rtc::scoped_ptr<cricket::DataChannel> data_channel_;
|
|
|