| 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 |
| 11 #include "webrtc/voice_engine/voe_external_media_impl.h" | 11 #include "webrtc/voice_engine/voe_external_media_impl.h" |
| 12 | 12 |
| 13 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" | |
| 14 #include "webrtc/system_wrappers/include/trace.h" | 13 #include "webrtc/system_wrappers/include/trace.h" |
| 15 #include "webrtc/voice_engine/channel.h" | 14 #include "webrtc/voice_engine/channel.h" |
| 16 #include "webrtc/voice_engine/include/voe_errors.h" | 15 #include "webrtc/voice_engine/include/voe_errors.h" |
| 17 #include "webrtc/voice_engine/output_mixer.h" | 16 #include "webrtc/voice_engine/output_mixer.h" |
| 18 #include "webrtc/voice_engine/transmit_mixer.h" | 17 #include "webrtc/voice_engine/transmit_mixer.h" |
| 19 #include "webrtc/voice_engine/voice_engine_impl.h" | 18 #include "webrtc/voice_engine/voice_engine_impl.h" |
| 20 | 19 |
| 21 namespace webrtc { | 20 namespace webrtc { |
| 22 | 21 |
| 23 VoEExternalMedia* VoEExternalMedia::GetInterface(VoiceEngine* voiceEngine) { | 22 VoEExternalMedia* VoEExternalMedia::GetInterface(VoiceEngine* voiceEngine) { |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 170 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 172 "SetExternalMixing() failed to locate channel"); | 171 "SetExternalMixing() failed to locate channel"); |
| 173 return -1; | 172 return -1; |
| 174 } | 173 } |
| 175 return channelPtr->SetExternalMixing(enable); | 174 return channelPtr->SetExternalMixing(enable); |
| 176 } | 175 } |
| 177 | 176 |
| 178 #endif // WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API | 177 #endif // WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API |
| 179 | 178 |
| 180 } // namespace webrtc | 179 } // namespace webrtc |
| OLD | NEW |