Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(528)

Side by Side Diff: webrtc/voice_engine/voe_file_impl.cc

Issue 2549443002: Remove API-related #defines from voice_engine_configurations.h (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
26 namespace webrtc { 22 namespace webrtc {
27 23
28 VoEFile* VoEFile::GetInterface(VoiceEngine* voiceEngine) { 24 VoEFile* VoEFile::GetInterface(VoiceEngine* voiceEngine) {
29 #ifndef WEBRTC_VOICE_ENGINE_FILE_API
30 return NULL;
31 #else
32 if (NULL == voiceEngine) { 25 if (NULL == voiceEngine) {
33 return NULL; 26 return NULL;
34 } 27 }
35 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); 28 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
36 s->AddRef(); 29 s->AddRef();
37 return s; 30 return s;
38 #endif
39 } 31 }
40 32
41 #ifdef WEBRTC_VOICE_ENGINE_FILE_API
42
43 VoEFileImpl::VoEFileImpl(voe::SharedData* shared) : _shared(shared) { 33 VoEFileImpl::VoEFileImpl(voe::SharedData* shared) : _shared(shared) {
44 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), 34 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1),
45 "VoEFileImpl::VoEFileImpl() - ctor"); 35 "VoEFileImpl::VoEFileImpl() - ctor");
46 } 36 }
47 37
48 VoEFileImpl::~VoEFileImpl() { 38 VoEFileImpl::~VoEFileImpl() {
49 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), 39 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1),
50 "VoEFileImpl::~VoEFileImpl() - dtor"); 40 "VoEFileImpl::~VoEFileImpl() - dtor");
51 } 41 }
52 42
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 457
468 if (_shared->transmit_mixer()->StopRecordingMicrophone() != 0) { 458 if (_shared->transmit_mixer()->StopRecordingMicrophone() != 0) {
469 WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_shared->instance_id(), -1), 459 WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_shared->instance_id(), -1),
470 "StopRecordingMicrophone() failed to stop recording to mixer"); 460 "StopRecordingMicrophone() failed to stop recording to mixer");
471 err = -1; 461 err = -1;
472 } 462 }
473 463
474 return err; 464 return err;
475 } 465 }
476 466
477 #endif // #ifdef WEBRTC_VOICE_ENGINE_FILE_API
478
479 } // namespace webrtc 467 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/voe_external_media_impl.cc ('k') | webrtc/voice_engine/voe_hardware_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698