| Index: talk/session/media/channelmanager.cc
|
| diff --git a/talk/session/media/channelmanager.cc b/talk/session/media/channelmanager.cc
|
| index bd89a41328cb345728bdec0912b4f230a3242a94..667ad9dd33642c97b868d4e0885a47caa16e0605 100644
|
| --- a/talk/session/media/channelmanager.cc
|
| +++ b/talk/session/media/channelmanager.cc
|
| @@ -500,18 +500,18 @@ bool ChannelManager::RestartVideoCapture(
|
| video_capturer, previous_format, desired_format, options));
|
| }
|
|
|
| -bool ChannelManager::AddVideoRenderer(
|
| - VideoCapturer* capturer, VideoRenderer* renderer) {
|
| +bool ChannelManager::AddVideoSink(
|
| + VideoCapturer* capturer, rtc::VideoSinkInterface<VideoFrame>* sink) {
|
| return initialized_ && worker_thread_->Invoke<bool>(
|
| - Bind(&CaptureManager::AddVideoRenderer,
|
| - capture_manager_.get(), capturer, renderer));
|
| + Bind(&CaptureManager::AddVideoSink,
|
| + capture_manager_.get(), capturer, sink));
|
| }
|
|
|
| -bool ChannelManager::RemoveVideoRenderer(
|
| - VideoCapturer* capturer, VideoRenderer* renderer) {
|
| +bool ChannelManager::RemoveVideoSink(
|
| + VideoCapturer* capturer, rtc::VideoSinkInterface<VideoFrame>* sink) {
|
| return initialized_ && worker_thread_->Invoke<bool>(
|
| - Bind(&CaptureManager::RemoveVideoRenderer,
|
| - capture_manager_.get(), capturer, renderer));
|
| + Bind(&CaptureManager::RemoveVideoSink,
|
| + capture_manager_.get(), capturer, sink));
|
| }
|
|
|
| bool ChannelManager::IsScreencastRunning() const {
|
|
|