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

Unified Diff: talk/session/media/typingmonitor.cc

Issue 1327933002: Full impl of NnChannel::SetSendParameters and NnChannel::SetRecvParameters (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Got rid of SetChannelOptions Created 5 years, 3 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
Index: talk/session/media/typingmonitor.cc
diff --git a/talk/session/media/typingmonitor.cc b/talk/session/media/typingmonitor.cc
index ee0f92a60af2446c75ea519c6f293a818f4153da..ec2358bd1faf3150eefcc86c77b6ddce02b76471 100644
--- a/talk/session/media/typingmonitor.cc
+++ b/talk/session/media/typingmonitor.cc
@@ -55,7 +55,7 @@ TypingMonitor::~TypingMonitor() {
rtc::MessageList messages;
worker_thread_->Clear(this, 0, &messages);
ASSERT(messages.size() == 1);
- channel_->MuteStream(0, false);
+ channel_->MuteStream(0, false, nullptr);
SignalMuted(channel_, false);
}
}
@@ -72,7 +72,7 @@ void TypingMonitor::OnVoiceChannelError(uint32 ssrc,
// TODO(perkj): Refactor TypingMonitor and the MediaChannel to handle
// multiple sending audio streams. SSRC 0 means the default sending audio
// channel.
- channel_->MuteStream(0, true);
+ channel_->MuteStream(0, true, nullptr);
SignalMuted(channel_, true);
has_pending_unmute_ = true;
muted_at_ = rtc::Time();
@@ -111,7 +111,7 @@ void TypingMonitor::OnMessage(rtc::Message* msg) {
<< "ms ago, unmuting after " << rtc::TimeSince(muted_at_)
<< "ms total.";
has_pending_unmute_ = false;
- channel_->MuteStream(0, false);
+ channel_->MuteStream(0, false, nullptr);
SignalMuted(channel_, false);
} else {
LOG(LS_INFO) << "Mute timeout hit, last typing " << silence_period
« talk/session/media/channel_unittest.cc ('K') | « talk/session/media/channel_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698