| Index: talk/session/media/channel.cc
|
| diff --git a/talk/session/media/channel.cc b/talk/session/media/channel.cc
|
| index 0134d343d2a7d419916899a016dd995dae8f177d..d30972db06f13ef94bc5ca347d01ae4796034b87 100644
|
| --- a/talk/session/media/channel.cc
|
| +++ b/talk/session/media/channel.cc
|
| @@ -204,11 +204,6 @@ bool BaseChannel::Init() {
|
| return false;
|
| }
|
|
|
| - session_->SignalNewLocalDescription.connect(
|
| - this, &BaseChannel::OnNewLocalDescription);
|
| - session_->SignalNewRemoteDescription.connect(
|
| - this, &BaseChannel::OnNewRemoteDescription);
|
| -
|
| // Both RTP and RTCP channels are set, we can call SetInterface on
|
| // media channel and it can set network options.
|
| media_channel_->SetInterface(this);
|
| @@ -663,24 +658,6 @@ void BaseChannel::HandlePacket(bool rtcp, rtc::Buffer* packet,
|
| }
|
| }
|
|
|
| -void BaseChannel::OnNewLocalDescription(
|
| - BaseSession* session, ContentAction action) {
|
| - std::string error_desc;
|
| - if (!PushdownLocalDescription(
|
| - session->local_description(), action, &error_desc)) {
|
| - SetSessionError(session_, BaseSession::ERROR_CONTENT, error_desc);
|
| - }
|
| -}
|
| -
|
| -void BaseChannel::OnNewRemoteDescription(
|
| - BaseSession* session, ContentAction action) {
|
| - std::string error_desc;
|
| - if (!PushdownRemoteDescription(
|
| - session->remote_description(), action, &error_desc)) {
|
| - SetSessionError(session_, BaseSession::ERROR_CONTENT, error_desc);
|
| - }
|
| -}
|
| -
|
| bool BaseChannel::PushdownLocalDescription(
|
| const SessionDescription* local_desc, ContentAction action,
|
| std::string* error_desc) {
|
|
|