diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-26 19:17:59 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-07-26 19:17:59 +0000 |
| commit | 1e09a711263dd105e6f7a03812250084c64e5fd8 (patch) | |
| tree | 0549edb6f2115cbfd763d8ccd6357cb9bc9eeea5 /talk/app/webrtc/mediastreamhandler.cc | |
| parent | 367f640beac67a31a5146ce613302499b5c645df (diff) | |
| download | webrtc-1e09a711263dd105e6f7a03812250084c64e5fd8.tar.gz | |
Update talk folder to revision=49952949
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4413 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/app/webrtc/mediastreamhandler.cc')
| -rw-r--r-- | talk/app/webrtc/mediastreamhandler.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/talk/app/webrtc/mediastreamhandler.cc b/talk/app/webrtc/mediastreamhandler.cc index a6a45b2149..d43c6d5a1d 100644 --- a/talk/app/webrtc/mediastreamhandler.cc +++ b/talk/app/webrtc/mediastreamhandler.cc @@ -75,7 +75,7 @@ void LocalAudioTrackHandler::OnStateChanged() { void LocalAudioTrackHandler::Stop() { cricket::AudioOptions options; - provider_->SetAudioSend(ssrc(), false, options); + provider_->SetAudioSend(ssrc(), false, options, NULL); } void LocalAudioTrackHandler::OnEnabledChanged() { @@ -84,7 +84,8 @@ void LocalAudioTrackHandler::OnEnabledChanged() { options = static_cast<LocalAudioSource*>( audio_track_->GetSource())->options(); } - provider_->SetAudioSend(ssrc(), audio_track_->enabled(), options); + provider_->SetAudioSend(ssrc(), audio_track_->enabled(), options, + audio_track_->GetRenderer()); } RemoteAudioTrackHandler::RemoteAudioTrackHandler( @@ -95,21 +96,21 @@ RemoteAudioTrackHandler::RemoteAudioTrackHandler( audio_track_(track), provider_(provider) { OnEnabledChanged(); - provider_->SetAudioRenderer(ssrc, audio_track_->FrameInput()); } RemoteAudioTrackHandler::~RemoteAudioTrackHandler() { } void RemoteAudioTrackHandler::Stop() { - provider_->SetAudioPlayout(ssrc(), false); + provider_->SetAudioPlayout(ssrc(), false, NULL); } void RemoteAudioTrackHandler::OnStateChanged() { } void RemoteAudioTrackHandler::OnEnabledChanged() { - provider_->SetAudioPlayout(ssrc(), audio_track_->enabled()); + provider_->SetAudioPlayout(ssrc(), audio_track_->enabled(), + audio_track_->GetRenderer()); } LocalVideoTrackHandler::LocalVideoTrackHandler( |