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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
861 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 860 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
862 "AssociateSendChannel() failed to locate accociate_send_channel"); | 861 "AssociateSendChannel() failed to locate accociate_send_channel"); |
863 return -1; | 862 return -1; |
864 } | 863 } |
865 | 864 |
866 channel_ptr->set_associate_send_channel(ch); | 865 channel_ptr->set_associate_send_channel(ch); |
867 return 0; | 866 return 0; |
868 } | 867 } |
869 | 868 |
870 } // namespace webrtc | 869 } // namespace webrtc |
OLD | NEW |