Remove AudioDeviceObserver and make ADM not inherit from the Module interface.

voice_engine/voe_base_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 23 matching lines @@
   return s;
 }
 
 VoEBaseImpl::VoEBaseImpl(voe::SharedData* shared)
     : shared_(shared) {}
 
 VoEBaseImpl::~VoEBaseImpl() {
   TerminateInternal();
 }
 
-void VoEBaseImpl::OnErrorIsReported(const ErrorCode error) {
-  if (error == AudioDeviceObserver::kRecordingError) {
-    LOG_F(LS_ERROR) << "VE_RUNTIME_REC_ERROR";
-  } else if (error == AudioDeviceObserver::kPlayoutError) {
-    LOG_F(LS_ERROR) << "VE_RUNTIME_PLAY_ERROR";
-  }
-}
-
-void VoEBaseImpl::OnWarningIsReported(const WarningCode warning) {
-  if (warning == AudioDeviceObserver::kRecordingWarning) {
-    LOG_F(LS_WARNING) << "VE_RUNTIME_REC_WARNING";
-  } else if (warning == AudioDeviceObserver::kPlayoutWarning) {
-    LOG_F(LS_WARNING) << "VE_RUNTIME_PLAY_WARNING";
-  }
-}
-
 int32_t VoEBaseImpl::RecordedDataIsAvailable(
     const void* audio_data,
     const size_t number_of_frames,
     const size_t bytes_per_sample,
     const size_t number_of_channels,
     const uint32_t sample_rate,
     const uint32_t audio_delay_milliseconds,
     const int32_t clock_drift,
     const uint32_t volume,
     const bool key_pressed,
@@ skipping 114 matching lines @@
       return -1;
     }
 #endif  // WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE
   } else {
     // Use the already existing external ADM implementation.
     shared_->set_audio_device(external_adm);
     LOG_F(LS_INFO)
         << "An external ADM implementation will be used in VoiceEngine";
   }
 
-  // Register the ADM to the process thread, which will drive the error
-  // callback mechanism
-  if (shared_->process_thread()) {
-    shared_->process_thread()->RegisterModule(shared_->audio_device(),
-                                              RTC_FROM_HERE);
-  }
-
   bool available = false;
 
   // --------------------
   // Reinitialize the ADM
 
-  // Register the AudioObserver implementation
-  if (shared_->audio_device()->RegisterEventObserver(this) != 0) {
-    LOG(LS_ERROR) << "Init() failed to register event observer for the ADM";
-  }
-
   // Register the AudioTransport implementation
   if (shared_->audio_device()->RegisterAudioCallback(this) != 0) {
     LOG(LS_ERROR) << "Init() failed to register audio callback for the ADM";
   }
 
   // ADM initialization
   if (shared_->audio_device()->Init() != 0) {
     LOG(LS_ERROR) << "Init() failed to initialize the ADM";
     return -1;
   }
@@ skipping 261 matching lines @@
   }
 
   return 0;
 }
 
 int32_t VoEBaseImpl::TerminateInternal() {
   // Delete any remaining channel objects
   shared_->channel_manager().DestroyAllChannels();
 
   if (shared_->process_thread()) {
-    if (shared_->audio_device()) {
-      shared_->process_thread()->DeRegisterModule(shared_->audio_device());
-    }
     shared_->process_thread()->Stop();
   }
 
   if (shared_->audio_device()) {
     if (shared_->audio_device()->StopPlayout() != 0) {
       LOG(LS_ERROR) << "TerminateInternal() failed to stop playout";
     }
     if (shared_->audio_device()->StopRecording() != 0) {
       LOG(LS_ERROR) << "TerminateInternal() failed to stop recording";
     }
-    if (shared_->audio_device()->RegisterEventObserver(nullptr) != 0) {
-      LOG(LS_ERROR) << "TerminateInternal() failed to de-register event "
-                       "observer for the ADM";
-    }
     if (shared_->audio_device()->RegisterAudioCallback(nullptr) != 0) {
       LOG(LS_ERROR) << "TerminateInternal() failed to de-register audio "
                        "callback for the ADM";
     }
     if (shared_->audio_device()->Terminate() != 0) {
       LOG(LS_ERROR) << "TerminateInternal() failed to terminate the ADM";
     }
     shared_->set_audio_device(nullptr);
   }
 
   shared_->set_audio_processing(nullptr);
 
   return 0;
 }
 }  // namespace webrtc