| Index: webrtc/voice_engine/test/auto_test/voe_standard_test.h
|
| diff --git a/webrtc/voice_engine/test/auto_test/voe_standard_test.h b/webrtc/voice_engine/test/auto_test/voe_standard_test.h
|
| index 38688b33f02bf82e0b74234a089f35ef13c0f911..6401cd1536fb9dd817d7d9d00dfd4bf7eac73aff 100644
|
| --- a/webrtc/voice_engine/test/auto_test/voe_standard_test.h
|
| +++ b/webrtc/voice_engine/test/auto_test/voe_standard_test.h
|
| @@ -17,7 +17,6 @@
|
| #include "gflags/gflags.h"
|
| #include "webrtc/voice_engine/include/voe_audio_processing.h"
|
| #include "webrtc/voice_engine/include/voe_base.h"
|
| -#include "webrtc/voice_engine/include/voe_dtmf.h"
|
| #include "webrtc/voice_engine/include/voe_errors.h"
|
| #include "webrtc/voice_engine/include/voe_file.h"
|
| #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
|
| @@ -60,7 +59,6 @@ class SubAPIManager {
|
| SubAPIManager()
|
| : _base(true),
|
| _codec(false),
|
| - _dtmf(false),
|
| _externalMedia(false),
|
| _file(false),
|
| _hardware(false),
|
| @@ -73,9 +71,6 @@ class SubAPIManager {
|
| #ifdef WEBRTC_VOICE_ENGINE_CODEC_API
|
| _codec = true;
|
| #endif
|
| -#ifdef WEBRTC_VOICE_ENGINE_DTMF_API
|
| - _dtmf = true;
|
| -#endif
|
| #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
|
| _externalMedia = true;
|
| #endif
|
| @@ -106,7 +101,7 @@ class SubAPIManager {
|
| void DisplayStatus() const;
|
|
|
| private:
|
| - bool _base, _codec, _dtmf;
|
| + bool _base, _codec;
|
| bool _externalMedia, _file, _hardware;
|
| bool _netEqStats, _network, _rtp_rtcp, _videoSync, _volumeControl, _apm;
|
| };
|
| @@ -142,9 +137,6 @@ class VoETestManager {
|
| VoEVolumeControl* VolumeControlPtr() const {
|
| return voe_volume_control_;
|
| }
|
| - VoEDtmf* DtmfPtr() const {
|
| - return voe_dtmf_;
|
| - }
|
| VoERTP_RTCP* RTP_RTCPPtr() const {
|
| return voe_rtp_rtcp_;
|
| }
|
| @@ -184,7 +176,6 @@ class VoETestManager {
|
| VoiceEngine* voice_engine_;
|
| VoEBase* voe_base_;
|
| VoECodec* voe_codec_;
|
| - VoEDtmf* voe_dtmf_;
|
| VoEExternalMedia* voe_xmedia_;
|
| VoEFile* voe_file_;
|
| VoEHardware* voe_hardware_;
|
|
|