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

modules/audio_device/win/audio_device_core_win.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 446 matching lines @@
       _hSetCaptureVolumeEvent(NULL),
       _hMmTask(NULL),
       _initialized(false),
       _recording(false),
       _playing(false),
       _recIsInitialized(false),
       _playIsInitialized(false),
       _speakerIsInitialized(false),
       _microphoneIsInitialized(false),
       _AGC(false),
-      _playWarning(0),
-      _playError(0),
-      _recWarning(0),
-      _recError(0),
       _playBufDelay(80),
       _usingInputDeviceIndex(false),
       _usingOutputDeviceIndex(false),
       _inputDevice(AudioDeviceModule::kDefaultCommunicationDevice),
       _outputDevice(AudioDeviceModule::kDefaultCommunicationDevice),
       _inputDeviceIndex(0),
       _outputDeviceIndex(0),
       _newMicLevel(0) {
   LOG(LS_INFO) << __FUNCTION__ << " created";
   assert(_comInit.succeeded());
@@ skipping 197 matching lines @@
 //  Init
 // ----------------------------------------------------------------------------
 
 AudioDeviceGeneric::InitStatus AudioDeviceWindowsCore::Init() {
   rtc::CritScope lock(&_critSect);
 
   if (_initialized) {
     return InitStatus::OK;
   }
 
-  _playWarning = 0;
-  _playError = 0;
-  _recWarning = 0;
-  _recError = 0;
-
   // Enumerate all audio rendering and capturing endpoint devices.
   // Note that, some of these will not be able to select by the user.
   // The complete collection is for internal use only.
   _EnumerateEndpointDevicesAll(eRender);
   _EnumerateEndpointDevicesAll(eCapture);
 
   _initialized = true;
 
   return InitStatus::OK;
 }
@@ skipping 2351 matching lines @@
 
 // ----------------------------------------------------------------------------
 //  Playing
 // ----------------------------------------------------------------------------
 
 bool AudioDeviceWindowsCore::Playing() const
 {
     return (_playing);
 }
 
-// ----------------------------------------------------------------------------
-//  PlayoutWarning
-// ----------------------------------------------------------------------------
-
-bool AudioDeviceWindowsCore::PlayoutWarning() const
-{
-    return ( _playWarning > 0);
-}
-
-// ----------------------------------------------------------------------------
-//  PlayoutError
-// ----------------------------------------------------------------------------
-
-bool AudioDeviceWindowsCore::PlayoutError() const
-{
-    return ( _playError > 0);
-}
-
-// ----------------------------------------------------------------------------
-//  RecordingWarning
-// ----------------------------------------------------------------------------
-
-bool AudioDeviceWindowsCore::RecordingWarning() const
-{
-    return ( _recWarning > 0);
-}
-
-// ----------------------------------------------------------------------------
-//  RecordingError
-// ----------------------------------------------------------------------------
-
-bool AudioDeviceWindowsCore::RecordingError() const
-{
-    return ( _recError > 0);
-}
-
-// ----------------------------------------------------------------------------
-//  ClearPlayoutWarning
-// ----------------------------------------------------------------------------
-
-void AudioDeviceWindowsCore::ClearPlayoutWarning()
-{
-    _playWarning = 0;
-}
-
-// ----------------------------------------------------------------------------
-//  ClearPlayoutError
-// ----------------------------------------------------------------------------
-
-void AudioDeviceWindowsCore::ClearPlayoutError()
-{
-    _playError = 0;
-}
-
-// ----------------------------------------------------------------------------
-//  ClearRecordingWarning
-// ----------------------------------------------------------------------------
-
-void AudioDeviceWindowsCore::ClearRecordingWarning()
-{
-    _recWarning = 0;
-}
-
-// ----------------------------------------------------------------------------
-//  ClearRecordingError
-// ----------------------------------------------------------------------------
-
-void AudioDeviceWindowsCore::ClearRecordingError()
-{
-    _recError = 0;
-}
-
 // ============================================================================
 //                                 Private Methods
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 //  [static] WSAPIRenderThread
 // ----------------------------------------------------------------------------
 
 DWORD WINAPI AudioDeviceWindowsCore::WSAPIRenderThread(LPVOID context)
 {
@@ skipping 369 matching lines @@
             if (FAILED(hr))
             {
                 _TraceCOMError(hr);
             }
             hr = _ptrClientOut->Reset();
             if (FAILED(hr))
             {
                 _TraceCOMError(hr);
             }
         }
-        // Trigger callback from module process thread
-        _playError = 1;
         LOG(LS_ERROR)
-            << "kPlayoutError message posted: rendering thread has ended"
-            << " pre-maturely";
+            << "Playout error: rendering thread has ended pre-maturely";
     }
     else
     {
         LOG(LS_VERBOSE) << "_Rendering thread is now terminated properly";
     }
 
     _UnLock();
 
     return (DWORD)hr;
 }
@@ skipping 162 matching lines @@
                 break;
             }
         }
     }
     // ---------------------------- THREAD LOOP ---------------------------- <<
 
     RevertCaptureThreadPriority();
 
     if (FAILED(hr))
     {
-        // Trigger callback from module process thread
-        _recError = 1;
-        LOG(LS_ERROR) << "kRecordingError message posted: capturing thread has"
-                      << " ended prematurely";
+        LOG(LS_ERROR)
+            << "Recording error: capturing thread has ended prematurely";
     }
     else
     {
         LOG(LS_VERBOSE) << "Capturing thread is now terminated properly";
     }
 
     return hr;
 }
 
 
@@ skipping 279 matching lines @@
             {
                 _TraceCOMError(hr);
             }
             hr = _ptrClientIn->Reset();
             if (FAILED(hr))
             {
                 _TraceCOMError(hr);
             }
         }
 
-        // Trigger callback from module process thread
-        _recError = 1;
         LOG(LS_ERROR)
-            << "kRecordingError message posted: capturing thread has ended"
-            << " pre-maturely";
+            << "Recording error: capturing thread has ended pre-maturely";
     }
     else
     {
         LOG(LS_VERBOSE) << "_Capturing thread is now terminated properly";
     }
 
     SAFE_RELEASE(_ptrClientIn);
     SAFE_RELEASE(_ptrCaptureClient);
 
     _UnLock();
@@ skipping 930 matching lines @@
   int key_down = 0;
   for (int key = VK_SPACE; key < VK_NUMLOCK; key++) {
     short res = GetAsyncKeyState(key);
     key_down |= res & 0x1; // Get the LSB
   }
   return (key_down > 0);
 }
 }  // namespace webrtc
 
 #endif  // WEBRTC_WINDOWS_CORE_AUDIO_BUILD