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