| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 748 int accociate_send_channel) { | 748 int accociate_send_channel) { |
| 749 rtc::CritScope cs(shared_->crit_sec()); | 749 rtc::CritScope cs(shared_->crit_sec()); |
| 750 | 750 |
| 751 if (!shared_->statistics().Initialized()) { | 751 if (!shared_->statistics().Initialized()) { |
| 752 shared_->SetLastError(VE_NOT_INITED, kTraceError); | 752 shared_->SetLastError(VE_NOT_INITED, kTraceError); |
| 753 return -1; | 753 return -1; |
| 754 } | 754 } |
| 755 | 755 |
| 756 voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel); | 756 voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel); |
| 757 voe::Channel* channel_ptr = ch.channel(); | 757 voe::Channel* channel_ptr = ch.channel(); |
| 758 if (channel_ptr == NULL) { | 758 if (channel_ptr == nullptr) { |
| 759 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 759 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 760 "AssociateSendChannel() failed to locate channel"); | 760 "AssociateSendChannel() failed to locate channel"); |
| 761 return -1; | 761 return -1; |
| 762 } | 762 } |
| 763 | 763 |
| 764 ch = shared_->channel_manager().GetChannel(accociate_send_channel); | 764 ch = shared_->channel_manager().GetChannel(accociate_send_channel); |
| 765 voe::Channel* accociate_send_channel_ptr = ch.channel(); | 765 voe::Channel* accociate_send_channel_ptr = ch.channel(); |
| 766 if (accociate_send_channel_ptr == NULL) { | 766 if (accociate_send_channel_ptr == nullptr) { |
| 767 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 767 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 768 "AssociateSendChannel() failed to locate accociate_send_channel"); | 768 "AssociateSendChannel() failed to locate accociate_send_channel"); |
| 769 return -1; | 769 return -1; |
| 770 } | 770 } |
| 771 | 771 |
| 772 channel_ptr->set_associate_send_channel(ch); | 772 channel_ptr->set_associate_send_channel(ch); |
| 773 return 0; | 773 return 0; |
| 774 } | 774 } |
| 775 | 775 |
| 776 } // namespace webrtc | 776 } // namespace webrtc |
| OLD | NEW |