diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc index 4254551d69..48297fcd06 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.cc +++ b/webrtc/modules/audio_processing/audio_processing_impl.cc @@ -71,9 +71,6 @@ AudioProcessing* AudioProcessing::Create(const Config& config) { return apm; } -int32_t AudioProcessing::TimeUntilNextProcess() { return -1; } -int32_t AudioProcessing::Process() { return -1; } - AudioProcessingImpl::AudioProcessingImpl(const Config& config) : echo_cancellation_(NULL), echo_control_mobile_(NULL), @@ -692,10 +689,6 @@ VoiceDetection* AudioProcessingImpl::voice_detection() const { return voice_detection_; } -int32_t AudioProcessingImpl::ChangeUniqueId(const int32_t id) { - return kNoError; -} - bool AudioProcessingImpl::is_data_processed() const { int enabled_count = 0; std::list::const_iterator it; diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h index 9c1de30aa9..09e2192a64 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.h +++ b/webrtc/modules/audio_processing/audio_processing_impl.h @@ -92,9 +92,6 @@ class AudioProcessingImpl : public AudioProcessing { virtual NoiseSuppression* noise_suppression() const OVERRIDE; virtual VoiceDetection* voice_detection() const OVERRIDE; - // Module methods. - virtual int32_t ChangeUniqueId(const int32_t id) OVERRIDE; - protected: virtual int InitializeLocked(); diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h index d02b30d90b..c34baacb87 100644 --- a/webrtc/modules/audio_processing/include/audio_processing.h +++ b/webrtc/modules/audio_processing/include/audio_processing.h @@ -15,7 +15,6 @@ #include // FILE #include "webrtc/common.h" -#include "webrtc/modules/interface/module.h" #include "webrtc/typedefs.h" struct AecCore; @@ -134,7 +133,7 @@ struct ExperimentalAgc { // // Close the application... // delete apm; // -class AudioProcessing : public Module { +class AudioProcessing { public: // Creates an APM instance. Use one instance for every primary audio stream // requiring processing. On the client-side, this would typically be one @@ -305,10 +304,6 @@ class AudioProcessing : public Module { // will continue, but the parameter may have been truncated. kBadStreamParameterWarning = -13 }; - - // Inherited from Module. - virtual int32_t TimeUntilNextProcess() OVERRIDE; - virtual int32_t Process() OVERRIDE; }; // The acoustic echo cancellation (AEC) component provides better performance