| 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 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 return -1; | 413 return -1; |
| 414 } else if (channel_owner->channel()->Init() != 0) { | 414 } else if (channel_owner->channel()->Init() != 0) { |
| 415 shared_->SetLastError( | 415 shared_->SetLastError( |
| 416 VE_CHANNEL_NOT_CREATED, kTraceError, | 416 VE_CHANNEL_NOT_CREATED, kTraceError, |
| 417 "CreateChannel() failed to initialize channel. Destroying" | 417 "CreateChannel() failed to initialize channel. Destroying" |
| 418 " channel."); | 418 " channel."); |
| 419 shared_->channel_manager().DestroyChannel( | 419 shared_->channel_manager().DestroyChannel( |
| 420 channel_owner->channel()->ChannelId()); | 420 channel_owner->channel()->ChannelId()); |
| 421 return -1; | 421 return -1; |
| 422 } | 422 } |
| 423 channel_owner->channel()->SetEventLog(shared_->event_log()); |
| 423 | 424 |
| 424 return channel_owner->channel()->ChannelId(); | 425 return channel_owner->channel()->ChannelId(); |
| 425 } | 426 } |
| 426 | 427 |
| 427 int VoEBaseImpl::DeleteChannel(int channel) { | 428 int VoEBaseImpl::DeleteChannel(int channel) { |
| 428 CriticalSectionScoped cs(shared_->crit_sec()); | 429 CriticalSectionScoped cs(shared_->crit_sec()); |
| 429 if (!shared_->statistics().Initialized()) { | 430 if (!shared_->statistics().Initialized()) { |
| 430 shared_->SetLastError(VE_NOT_INITED, kTraceError); | 431 shared_->SetLastError(VE_NOT_INITED, kTraceError); |
| 431 return -1; | 432 return -1; |
| 432 } | 433 } |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 865 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 865 "AssociateSendChannel() failed to locate accociate_send_channel"); | 866 "AssociateSendChannel() failed to locate accociate_send_channel"); |
| 866 return -1; | 867 return -1; |
| 867 } | 868 } |
| 868 | 869 |
| 869 channel_ptr->set_associate_send_channel(ch); | 870 channel_ptr->set_associate_send_channel(ch); |
| 870 return 0; | 871 return 0; |
| 871 } | 872 } |
| 872 | 873 |
| 873 } // namespace webrtc | 874 } // namespace webrtc |
| OLD | NEW |