| 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_file_impl.h" | 11 #include "webrtc/voice_engine/voe_file_impl.h" |
| 12 | 12 |
| 13 #include "webrtc/modules/media_file/media_file.h" | 13 #include "webrtc/modules/media_file/media_file.h" |
| 14 #include "webrtc/system_wrappers/include/file_wrapper.h" | 14 #include "webrtc/system_wrappers/include/file_wrapper.h" |
| 15 #include "webrtc/system_wrappers/include/trace.h" | 15 #include "webrtc/system_wrappers/include/trace.h" |
| 16 #include "webrtc/voice_engine/channel.h" | 16 #include "webrtc/voice_engine/channel.h" |
| 17 #include "webrtc/voice_engine/include/voe_errors.h" | 17 #include "webrtc/voice_engine/include/voe_errors.h" |
| 18 #include "webrtc/voice_engine/output_mixer.h" | 18 #include "webrtc/voice_engine/output_mixer.h" |
| 19 #include "webrtc/voice_engine/transmit_mixer.h" | 19 #include "webrtc/voice_engine/transmit_mixer.h" |
| 20 #include "webrtc/voice_engine/voice_engine_impl.h" | 20 #include "webrtc/voice_engine/voice_engine_impl.h" |
| 21 | 21 |
| 22 #ifndef WEBRTC_VOICE_ENGINE_FILE_API |
| 23 #error "Deprecated" |
| 24 #endif |
| 25 |
| 22 namespace webrtc { | 26 namespace webrtc { |
| 23 | 27 |
| 24 VoEFile* VoEFile::GetInterface(VoiceEngine* voiceEngine) { | 28 VoEFile* VoEFile::GetInterface(VoiceEngine* voiceEngine) { |
| 25 #ifndef WEBRTC_VOICE_ENGINE_FILE_API | 29 #ifndef WEBRTC_VOICE_ENGINE_FILE_API |
| 26 return NULL; | 30 return NULL; |
| 27 #else | 31 #else |
| 28 if (NULL == voiceEngine) { | 32 if (NULL == voiceEngine) { |
| 29 return NULL; | 33 return NULL; |
| 30 } | 34 } |
| 31 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); | 35 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); |
| (...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 466 "StopRecordingMicrophone() failed to stop recording to mixer"); | 470 "StopRecordingMicrophone() failed to stop recording to mixer"); |
| 467 err = -1; | 471 err = -1; |
| 468 } | 472 } |
| 469 | 473 |
| 470 return err; | 474 return err; |
| 471 } | 475 } |
| 472 | 476 |
| 473 #endif // #ifdef WEBRTC_VOICE_ENGINE_FILE_API | 477 #endif // #ifdef WEBRTC_VOICE_ENGINE_FILE_API |
| 474 | 478 |
| 475 } // namespace webrtc | 479 } // namespace webrtc |
| OLD | NEW |