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/trace.h" | 13 #include "webrtc/system_wrappers/include/trace.h" |
14 #include "webrtc/voice_engine/channel.h" | 14 #include "webrtc/voice_engine/channel.h" |
15 #include "webrtc/voice_engine/include/voe_errors.h" | 15 #include "webrtc/voice_engine/include/voe_errors.h" |
16 #include "webrtc/voice_engine/output_mixer.h" | 16 #include "webrtc/voice_engine/output_mixer.h" |
17 #include "webrtc/voice_engine/transmit_mixer.h" | 17 #include "webrtc/voice_engine/transmit_mixer.h" |
18 #include "webrtc/voice_engine/voice_engine_impl.h" | 18 #include "webrtc/voice_engine/voice_engine_impl.h" |
19 | 19 |
| 20 #ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API |
| 21 #error "Deprecated" |
| 22 #endif |
| 23 |
20 namespace webrtc { | 24 namespace webrtc { |
21 | 25 |
22 VoEExternalMedia* VoEExternalMedia::GetInterface(VoiceEngine* voiceEngine) { | 26 VoEExternalMedia* VoEExternalMedia::GetInterface(VoiceEngine* voiceEngine) { |
23 #ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API | 27 #ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API |
24 return NULL; | 28 return NULL; |
25 #else | 29 #else |
26 if (NULL == voiceEngine) { | 30 if (NULL == voiceEngine) { |
27 return NULL; | 31 return NULL; |
28 } | 32 } |
29 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); | 33 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 178 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
175 "SetExternalMixing() failed to locate channel"); | 179 "SetExternalMixing() failed to locate channel"); |
176 return -1; | 180 return -1; |
177 } | 181 } |
178 return channelPtr->SetExternalMixing(enable); | 182 return channelPtr->SetExternalMixing(enable); |
179 } | 183 } |
180 | 184 |
181 #endif // WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API | 185 #endif // WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API |
182 | 186 |
183 } // namespace webrtc | 187 } // namespace webrtc |
OLD | NEW |