diff options
author | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-22 22:27:04 +0000 |
---|---|---|
committer | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-22 22:27:04 +0000 |
commit | 2b73e54efd883e483dfee48c5417601306faf10e (patch) | |
tree | 760b0943bbeeb0fed90b054d2f6ca2d3774fbd64 /examples | |
parent | 62cf2cee3b53588bfab33a5d14e5aff11c26e433 (diff) | |
download | talk-2b73e54efd883e483dfee48c5417601306faf10e.tar.gz |
(Auto)update libjingle 73927658-> 73927775
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6958 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'examples')
-rw-r--r-- | examples/call/callclient.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/examples/call/callclient.cc b/examples/call/callclient.cc index 2c8a6bc..b31e24a 100644 --- a/examples/call/callclient.cc +++ b/examples/call/callclient.cc @@ -889,10 +889,8 @@ bool CallClient::PlaceCall(const std::string& name, AddSession(call_->InitiateSession(jid, media_client_->jid(), options)); } media_client_->SetFocus(call_); - if (call_->has_video() && render_) { - if (!options.is_muc) { - call_->SetLocalRenderer(local_renderer_); - } + if (call_->has_video() && render_ && !options.is_muc) { + // TODO(pthatcher): Hookup local_render_ to the local capturer. } if (options.is_muc) { const std::string& nick = mucs_[jid]->local_jid().resource(); @@ -1086,7 +1084,7 @@ void CallClient::Accept(const cricket::CallOptions& options) { call_->AcceptSession(session, options); media_client_->SetFocus(call_); if (call_->has_video() && render_) { - call_->SetLocalRenderer(local_renderer_); + // TODO(pthatcher): Hookup local_render_ to the local capturer. RenderAllStreams(call_, session, true); } SetupAcceptedCall(); |