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

modules/audio_device/linux/audio_device_pulse_linux.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 36 matching lines @@
       _playIsInitialized(false),
       _startRec(false),
       _stopRec(false),
       _startPlay(false),
       _stopPlay(false),
       _AGC(false),
       update_speaker_volume_at_startup_(false),
       _sndCardPlayDelay(0),
       _sndCardRecDelay(0),
       _writeErrors(0),
-      _playWarning(0),
-      _playError(0),
-      _recWarning(0),
-      _recError(0),
       _deviceIndex(-1),
       _numPlayDevices(0),
       _numRecDevices(0),
       _playDeviceName(NULL),
       _recDeviceName(NULL),
       _playDisplayDeviceName(NULL),
       _recDisplayDeviceName(NULL),
       _playBuffer(NULL),
       _playbackBufferSize(0),
       _playbackBufferUnused(0),
@@ skipping 82 matching lines @@
 
   // Initialize PulseAudio
   if (InitPulseAudio() < 0) {
     LOG(LS_ERROR) << "failed to initialize PulseAudio";
     if (TerminatePulseAudio() < 0) {
       LOG(LS_ERROR) << "failed to terminate PulseAudio";
     }
     return InitStatus::OTHER_ERROR;
   }
 
-  _playWarning = 0;
-  _playError = 0;
-  _recWarning = 0;
-  _recError = 0;
-
   // Get X display handle for typing detection
   _XDisplay = XOpenDisplay(NULL);
   if (!_XDisplay) {
     LOG(LS_WARNING)
         << "failed to open X display, typing detection will not work";
   }
 
   // RECORDING
   _ptrThreadRec.reset(new rtc::PlatformThread(
       RecThreadFunc, this, "webrtc_audio_module_rec_thread"));
@@ skipping 1107 matching lines @@
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   delayMS = (uint16_t)_sndCardRecDelay;
   return 0;
 }
 
 bool AudioDeviceLinuxPulse::Playing() const {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   return (_playing);
 }
 
-bool AudioDeviceLinuxPulse::PlayoutWarning() const {
-  rtc::CritScope lock(&_critSect);
-  return (_playWarning > 0);
-}
-
-bool AudioDeviceLinuxPulse::PlayoutError() const {
-  rtc::CritScope lock(&_critSect);
-  return (_playError > 0);
-}
-
-bool AudioDeviceLinuxPulse::RecordingWarning() const {
-  rtc::CritScope lock(&_critSect);
-  return (_recWarning > 0);
-}
-
-bool AudioDeviceLinuxPulse::RecordingError() const {
-  rtc::CritScope lock(&_critSect);
-  return (_recError > 0);
-}
-
-void AudioDeviceLinuxPulse::ClearPlayoutWarning() {
-  rtc::CritScope lock(&_critSect);
-  _playWarning = 0;
-}
-
-void AudioDeviceLinuxPulse::ClearPlayoutError() {
-  rtc::CritScope lock(&_critSect);
-  _playError = 0;
-}
-
-void AudioDeviceLinuxPulse::ClearRecordingWarning() {
-  rtc::CritScope lock(&_critSect);
-  _recWarning = 0;
-}
-
-void AudioDeviceLinuxPulse::ClearRecordingError() {
-  rtc::CritScope lock(&_critSect);
-  _recError = 0;
-}
-
 // ============================================================================
 //                                 Private Methods
 // ============================================================================
 
 void AudioDeviceLinuxPulse::PaContextStateCallback(pa_context* c, void* pThis) {
   static_cast<AudioDeviceLinuxPulse*>(pThis)->PaContextStateCallbackHandler(c);
 }
 
 // ----------------------------------------------------------------------------
 //  PaSinkInfoCallback
@@ skipping 839 matching lines @@
       if (_tempBufferSpace < write) {
         write = _tempBufferSpace;
       }
 
       PaLock();
       if (LATE(pa_stream_write)(
               _playStream, (void*)&_playBuffer[_playbackBufferUnused], write,
               NULL, (int64_t)0, PA_SEEK_RELATIVE) != PA_OK) {
         _writeErrors++;
         if (_writeErrors > 10) {
-          if (_playError == 1) {
-            LOG(LS_WARNING) << "pending playout error exists";
-          }
-          // Triggers callback from module process thread.
-          _playError = 1;
-          LOG(LS_ERROR) << "kPlayoutError message posted: _writeErrors="
+          LOG(LS_ERROR) << "Playout error: _writeErrors="
                         << _writeErrors
                         << ", error=" << LATE(pa_context_errno)(_paContext);
           _writeErrors = 0;
         }
       }
       PaUnLock();
 
       _playbackBufferUnused += write;
       _tempBufferSpace -= write;
     }
@@ skipping 23 matching lines @@
       if (_tempBufferSpace < write) {
         write = _tempBufferSpace;
       }
 
       LOG(LS_VERBOSE) << "will write";
       PaLock();
       if (LATE(pa_stream_write)(_playStream, (void*)&_playBuffer[0], write,
                                 NULL, (int64_t)0, PA_SEEK_RELATIVE) != PA_OK) {
         _writeErrors++;
         if (_writeErrors > 10) {
-          if (_playError == 1) {
-            LOG(LS_WARNING) << "pending playout error exists";
-          }
-          // Triggers callback from module process thread.
-          _playError = 1;
-          LOG(LS_ERROR) << "kPlayoutError message posted: _writeErrors="
+          LOG(LS_ERROR) << "Playout error: _writeErrors="
                         << _writeErrors
                         << ", error=" << LATE(pa_context_errno)(_paContext);
           _writeErrors = 0;
         }
       }
       PaUnLock();
 
       _playbackBufferUnused = write;
     }
 
@@ skipping 92 matching lines @@
       if (LATE(pa_stream_readable_size)(_recStream) <= 0) {
         // Then that was all the data
         break;
       }
 
       // Else more data.
       const void* sampleData;
       size_t sampleDataSize;
 
       if (LATE(pa_stream_peek)(_recStream, &sampleData, &sampleDataSize) != 0) {
-        _recError = 1;  // triggers callback from module process thread
-        LOG(LS_ERROR) << "RECORD_ERROR message posted, error = "
+        LOG(LS_ERROR) << "RECORD_ERROR, error = "
                       << LATE(pa_context_errno)(_paContext);
         break;
       }
 
       _sndCardRecDelay = (uint32_t)(LatencyUsecs(_recStream) / 1000);
 
       // Drop lock for sigslot dispatch, which could take a while.
       PaUnLock();
       // Read data and provide it to VoiceEngine
       if (ReadRecordedData(sampleData, sampleDataSize) == -1) {
@@ skipping 25 matching lines @@
 
   // A bit change in keymap means a key is pressed
   for (i = 0; i < sizeof(szKey); i++)
     state |= (szKey[i] ^ _oldKeyState[i]) & szKey[i];
 
   // Save old state
   memcpy((char*)_oldKeyState, (char*)szKey, sizeof(_oldKeyState));
   return (state != 0);
 }
 }  // namespace webrtc