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

modules/audio_device/mac/audio_device_mac.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 126 matching lines @@
       _twoDevices(true),
       _doStop(false),
       _doStopRec(false),
       _macBookPro(false),
       _macBookProPanRight(false),
       _captureLatencyUs(0),
       _renderLatencyUs(0),
       _captureDelayUs(0),
       _renderDelayUs(0),
       _renderDelayOffsetSamples(0),
-      _playWarning(0),
-      _playError(0),
-      _recWarning(0),
-      _recError(0),
       _paCaptureBuffer(NULL),
       _paRenderBuffer(NULL),
       _captureBufSizeSamples(0),
       _renderBufSizeSamples(0),
       prev_key_state_(),
       get_mic_volume_counter_ms_(0) {
   LOG(LS_INFO) << __FUNCTION__ << " created";
 
   RTC_DCHECK(&_stopEvent != NULL);
   RTC_DCHECK(&_stopEventRec != NULL);
@@ skipping 172 matching lines @@
   int intErr = sysctlbyname("hw.model", buf, &length, NULL, 0);
   if (intErr != 0) {
     LOG(LS_ERROR) << "Error in sysctlbyname(): " << err;
   } else {
     LOG(LS_VERBOSE) << "Hardware model: " << buf;
     if (strncmp(buf, "MacBookPro", 10) == 0) {
       _macBookPro = true;
     }
   }
 
-  _playWarning = 0;
-  _playError = 0;
-  _recWarning = 0;
-  _recError = 0;
-
   get_mic_volume_counter_ms_ = 0;
 
   _initialized = true;
 
   return InitStatus::OK;
 }
 
 int32_t AudioDeviceMac::Terminate() {
   if (!_initialized) {
     return 0;
@@ skipping 1190 matching lines @@
   int32_t captureDelayUs = AtomicGet32(&_captureDelayUs);
   delayMS =
       static_cast<uint16_t>(1e-3 * (captureDelayUs + _captureLatencyUs) + 0.5);
   return 0;
 }
 
 bool AudioDeviceMac::Playing() const {
   return (_playing);
 }
 
-bool AudioDeviceMac::PlayoutWarning() const {
-  return (_playWarning > 0);
-}
-
-bool AudioDeviceMac::PlayoutError() const {
-  return (_playError > 0);
-}
-
-bool AudioDeviceMac::RecordingWarning() const {
-  return (_recWarning > 0);
-}
-
-bool AudioDeviceMac::RecordingError() const {
-  return (_recError > 0);
-}
-
-void AudioDeviceMac::ClearPlayoutWarning() {
-  _playWarning = 0;
-}
-
-void AudioDeviceMac::ClearPlayoutError() {
-  _playError = 0;
-}
-
-void AudioDeviceMac::ClearRecordingWarning() {
-  _recWarning = 0;
-}
-
-void AudioDeviceMac::ClearRecordingError() {
-  _recError = 0;
-}
-
 // ============================================================================
 //                                 Private Methods
 // ============================================================================
 
 int32_t AudioDeviceMac::GetNumberDevices(const AudioObjectPropertyScope scope,
                                          AudioDeviceID scopedDeviceIds[],
                                          const uint32_t deviceListLength) {
   OSStatus err = noErr;
 
   AudioObjectPropertyAddress propertyAddress = {
@@ skipping 392 matching lines @@
         kAudioDevicePropertyDeviceIsAlive, kAudioDevicePropertyScopeInput, 0};
     UInt32 deviceIsAlive = 1;
     UInt32 size = sizeof(UInt32);
     err = AudioObjectGetPropertyData(_inputDeviceID, &propertyAddress, 0, NULL,
                                      &size, &deviceIsAlive);
 
     if (err == kAudioHardwareBadDeviceError || deviceIsAlive == 0) {
       LOG(LS_WARNING) << "Capture device is not alive (probably removed)";
       AtomicSet32(&_captureDeviceIsAlive, 0);
       _mixerManager.CloseMicrophone();
-      if (_recError == 1) {
-        LOG(LS_WARNING) << "pending recording error exists";
-      }
-      _recError = 1;  // triggers callback from module process thread
     } else if (err != noErr) {
       logCAMsg(rtc::LS_ERROR,
                "Error in AudioDeviceGetProperty()", (const char*)&err);
       return -1;
     }
   }
 
   if (SpeakerIsInitialized()) {
     AudioObjectPropertyAddress propertyAddress = {
         kAudioDevicePropertyDeviceIsAlive, kAudioDevicePropertyScopeOutput, 0};
     UInt32 deviceIsAlive = 1;
     UInt32 size = sizeof(UInt32);
     err = AudioObjectGetPropertyData(_outputDeviceID, &propertyAddress, 0, NULL,
                                      &size, &deviceIsAlive);
 
     if (err == kAudioHardwareBadDeviceError || deviceIsAlive == 0) {
       LOG(LS_WARNING) << "Render device is not alive (probably removed)";
       AtomicSet32(&_renderDeviceIsAlive, 0);
       _mixerManager.CloseSpeaker();
-      if (_playError == 1) {
-        LOG(LS_WARNING) << "pending playout error exists";
-      }
-      _playError = 1;  // triggers callback from module process thread
     } else if (err != noErr) {
       logCAMsg(rtc::LS_ERROR,
                "Error in AudioDeviceGetProperty()", (const char*)&err);
       return -1;
     }
   }
 
   return 0;
 }
 
@@ skipping 563 matching lines @@
     bool keyState =
         CGEventSourceKeyState(kCGEventSourceStateHIDSystemState, key_index);
     // A false -> true change in keymap means a key is pressed.
     key_down |= (keyState && !prev_key_state_[key_index]);
     // Save current state.
     prev_key_state_[key_index] = keyState;
   }
   return key_down;
 }
 }  // namespace webrtc