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

Side by Side Diff: webrtc/voice_engine/voice_engine_impl.h

Issue 1723153002: Remove the VoEDtmf interface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 9 months 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
« no previous file with comments | « webrtc/voice_engine/voice_engine.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H 11 #ifndef WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H
12 #define WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H 12 #define WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/engine_configurations.h" 16 #include "webrtc/engine_configurations.h"
17 #include "webrtc/system_wrappers/include/atomic32.h" 17 #include "webrtc/system_wrappers/include/atomic32.h"
18 #include "webrtc/voice_engine/voe_base_impl.h" 18 #include "webrtc/voice_engine/voe_base_impl.h"
19 19
20 #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API 20 #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
21 #include "webrtc/voice_engine/voe_audio_processing_impl.h" 21 #include "webrtc/voice_engine/voe_audio_processing_impl.h"
22 #endif 22 #endif
23 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API 23 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API
24 #include "webrtc/voice_engine/voe_codec_impl.h" 24 #include "webrtc/voice_engine/voe_codec_impl.h"
25 #endif 25 #endif
26 #ifdef WEBRTC_VOICE_ENGINE_DTMF_API
27 #include "webrtc/voice_engine/voe_dtmf_impl.h"
28 #endif
29 #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API 26 #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
30 #include "webrtc/voice_engine/voe_external_media_impl.h" 27 #include "webrtc/voice_engine/voe_external_media_impl.h"
31 #endif 28 #endif
32 #ifdef WEBRTC_VOICE_ENGINE_FILE_API 29 #ifdef WEBRTC_VOICE_ENGINE_FILE_API
33 #include "webrtc/voice_engine/voe_file_impl.h" 30 #include "webrtc/voice_engine/voe_file_impl.h"
34 #endif 31 #endif
35 #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API 32 #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API
36 #include "webrtc/voice_engine/voe_hardware_impl.h" 33 #include "webrtc/voice_engine/voe_hardware_impl.h"
37 #endif 34 #endif
38 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API 35 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
(...skipping 16 matching lines...) Expand all
55 } // namespace voe 52 } // namespace voe
56 53
57 class VoiceEngineImpl : public voe::SharedData, // Must be the first base class 54 class VoiceEngineImpl : public voe::SharedData, // Must be the first base class
58 public VoiceEngine, 55 public VoiceEngine,
59 #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API 56 #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
60 public VoEAudioProcessingImpl, 57 public VoEAudioProcessingImpl,
61 #endif 58 #endif
62 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API 59 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API
63 public VoECodecImpl, 60 public VoECodecImpl,
64 #endif 61 #endif
65 #ifdef WEBRTC_VOICE_ENGINE_DTMF_API
66 public VoEDtmfImpl,
67 #endif
68 #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API 62 #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
69 public VoEExternalMediaImpl, 63 public VoEExternalMediaImpl,
70 #endif 64 #endif
71 #ifdef WEBRTC_VOICE_ENGINE_FILE_API 65 #ifdef WEBRTC_VOICE_ENGINE_FILE_API
72 public VoEFileImpl, 66 public VoEFileImpl,
73 #endif 67 #endif
74 #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API 68 #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API
75 public VoEHardwareImpl, 69 public VoEHardwareImpl,
76 #endif 70 #endif
77 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API 71 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
(...skipping 12 matching lines...) Expand all
90 public VoEBaseImpl { 84 public VoEBaseImpl {
91 public: 85 public:
92 VoiceEngineImpl(const Config* config, bool owns_config) 86 VoiceEngineImpl(const Config* config, bool owns_config)
93 : SharedData(*config), 87 : SharedData(*config),
94 #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API 88 #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
95 VoEAudioProcessingImpl(this), 89 VoEAudioProcessingImpl(this),
96 #endif 90 #endif
97 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API 91 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API
98 VoECodecImpl(this), 92 VoECodecImpl(this),
99 #endif 93 #endif
100 #ifdef WEBRTC_VOICE_ENGINE_DTMF_API
101 VoEDtmfImpl(this),
102 #endif
103 #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API 94 #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
104 VoEExternalMediaImpl(this), 95 VoEExternalMediaImpl(this),
105 #endif 96 #endif
106 #ifdef WEBRTC_VOICE_ENGINE_FILE_API 97 #ifdef WEBRTC_VOICE_ENGINE_FILE_API
107 VoEFileImpl(this), 98 VoEFileImpl(this),
108 #endif 99 #endif
109 #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API 100 #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API
110 VoEHardwareImpl(this), 101 VoEHardwareImpl(this),
111 #endif 102 #endif
112 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API 103 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
(...skipping 28 matching lines...) Expand all
141 // manipulate the reference count. See: fake_voice_engine.h. 132 // manipulate the reference count. See: fake_voice_engine.h.
142 protected: 133 protected:
143 Atomic32 _ref_count; 134 Atomic32 _ref_count;
144 private: 135 private:
145 std::unique_ptr<const Config> own_config_; 136 std::unique_ptr<const Config> own_config_;
146 }; 137 };
147 138
148 } // namespace webrtc 139 } // namespace webrtc
149 140
150 #endif // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H 141 #endif // WEBRTC_VOICE_ENGINE_VOICE_ENGINE_IMPL_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/voice_engine.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698