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

modules/audio_device/audio_device_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 98 matching lines @@
 // ============================================================================
 //                            Construction & Destruction
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 //  AudioDeviceModuleImpl - ctor
 // ----------------------------------------------------------------------------
 
 AudioDeviceModuleImpl::AudioDeviceModuleImpl(const int32_t id,
                                              const AudioLayer audioLayer)
-    : _ptrCbAudioDeviceObserver(NULL),
-      _ptrAudioDevice(NULL),
+    : _ptrAudioDevice(NULL),
       _id(id),
       _platformAudioLayer(audioLayer),
-      _lastProcessTime(rtc::TimeMillis()),
       _platformType(kPlatformNotSupported),
       _initialized(false),
       _lastError(kAdmErrNone) {
   LOG(INFO) << __FUNCTION__;
 }
 
 // ----------------------------------------------------------------------------
 //  CheckPlatform
 // ----------------------------------------------------------------------------
 
@@ skipping 219 matching lines @@
 
 AudioDeviceModuleImpl::~AudioDeviceModuleImpl() {
   LOG(INFO) << __FUNCTION__;
   if (_ptrAudioDevice) {
     delete _ptrAudioDevice;
     _ptrAudioDevice = NULL;
   }
 }
 
 // ============================================================================
-//                                  Module
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-//  Module::TimeUntilNextProcess
-//
-//  Returns the number of milliseconds until the module want a worker thread
-//  to call Process().
-// ----------------------------------------------------------------------------
-
-int64_t AudioDeviceModuleImpl::TimeUntilNextProcess() {
-  int64_t now = rtc::TimeMillis();
-  int64_t deltaProcess = kAdmMaxIdleTimeProcess - (now - _lastProcessTime);
-  return deltaProcess;
-}
-
-// ----------------------------------------------------------------------------
-//  Module::Process
-//
-//  Check for posted error and warning reports. Generate callbacks if
-//  new reports exists.
-// ----------------------------------------------------------------------------
-
-void AudioDeviceModuleImpl::Process() {
-  _lastProcessTime = rtc::TimeMillis();
-
-  // kPlayoutWarning
-  if (_ptrAudioDevice->PlayoutWarning()) {
-    rtc::CritScope lock(&_critSectEventCb);
-    if (_ptrCbAudioDeviceObserver) {
-      LOG(WARNING) << "=> OnWarningIsReported(kPlayoutWarning)";
-      _ptrCbAudioDeviceObserver->OnWarningIsReported(
-          AudioDeviceObserver::kPlayoutWarning);
-    }
-    _ptrAudioDevice->ClearPlayoutWarning();
-  }
-
-  // kPlayoutError
-  if (_ptrAudioDevice->PlayoutError()) {
-    rtc::CritScope lock(&_critSectEventCb);
-    if (_ptrCbAudioDeviceObserver) {
-      LOG(LERROR) << "=> OnErrorIsReported(kPlayoutError)";
-      _ptrCbAudioDeviceObserver->OnErrorIsReported(
-          AudioDeviceObserver::kPlayoutError);
-    }
-    _ptrAudioDevice->ClearPlayoutError();
-  }
-
-  // kRecordingWarning
-  if (_ptrAudioDevice->RecordingWarning()) {
-    rtc::CritScope lock(&_critSectEventCb);
-    if (_ptrCbAudioDeviceObserver) {
-      LOG(WARNING) << "=> OnWarningIsReported(kRecordingWarning)";
-      _ptrCbAudioDeviceObserver->OnWarningIsReported(
-          AudioDeviceObserver::kRecordingWarning);
-    }
-    _ptrAudioDevice->ClearRecordingWarning();
-  }
-
-  // kRecordingError
-  if (_ptrAudioDevice->RecordingError()) {
-    rtc::CritScope lock(&_critSectEventCb);
-    if (_ptrCbAudioDeviceObserver) {
-      LOG(LERROR) << "=> OnErrorIsReported(kRecordingError)";
-      _ptrCbAudioDeviceObserver->OnErrorIsReported(
-          AudioDeviceObserver::kRecordingError);
-    }
-    _ptrAudioDevice->ClearRecordingError();
-  }
-}
-
-// ============================================================================
 //                                    Public API
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 //  ActiveAudioLayer
 // ----------------------------------------------------------------------------
 
 int32_t AudioDeviceModuleImpl::ActiveAudioLayer(AudioLayer* audioLayer) const {
   LOG(INFO) << __FUNCTION__;
   AudioLayer activeAudio;
@@ skipping 869 matching lines @@
 //  Recording
 // ----------------------------------------------------------------------------
 
 bool AudioDeviceModuleImpl::Recording() const {
   LOG(INFO) << __FUNCTION__;
   CHECK_INITIALIZED_BOOL();
   return (_ptrAudioDevice->Recording());
 }
 
 // ----------------------------------------------------------------------------
-//  RegisterEventObserver
-// ----------------------------------------------------------------------------
-
-int32_t AudioDeviceModuleImpl::RegisterEventObserver(
-    AudioDeviceObserver* eventCallback) {
-  LOG(INFO) << __FUNCTION__;
-  rtc::CritScope lock(&_critSectEventCb);
-  _ptrCbAudioDeviceObserver = eventCallback;
-
-  return 0;
-}
-
-// ----------------------------------------------------------------------------
 //  RegisterAudioCallback
 // ----------------------------------------------------------------------------
 
 int32_t AudioDeviceModuleImpl::RegisterAudioCallback(
     AudioTransport* audioCallback) {
   LOG(INFO) << __FUNCTION__;
   rtc::CritScope lock(&_critSectAudioCb);
   return _audioDeviceBuffer.RegisterAudioCallback(audioCallback);
 }
 
@@ skipping 222 matching lines @@
 //  PlatformAudioLayer
 // ----------------------------------------------------------------------------
 
 AudioDeviceModule::AudioLayer AudioDeviceModuleImpl::PlatformAudioLayer()
     const {
   LOG(INFO) << __FUNCTION__;
   return _platformAudioLayer;
 }
 
 }  // namespace webrtc