Index: modules/audio_device/win/audio_device_core_win.cc |
diff --git a/modules/audio_device/win/audio_device_core_win.cc b/modules/audio_device/win/audio_device_core_win.cc |
index aaf31fc91e4dee31421697c3c3bb782c9ad022b3..05f8e6436de1f3c888e677444967f59e33a8ef4d 100644 |
--- a/modules/audio_device/win/audio_device_core_win.cc |
+++ b/modules/audio_device/win/audio_device_core_win.cc |
@@ -464,10 +464,6 @@ AudioDeviceWindowsCore::AudioDeviceWindowsCore() |
_speakerIsInitialized(false), |
_microphoneIsInitialized(false), |
_AGC(false), |
- _playWarning(0), |
- _playError(0), |
- _recWarning(0), |
- _recError(0), |
_playBufDelay(80), |
_usingInputDeviceIndex(false), |
_usingOutputDeviceIndex(false), |
@@ -685,11 +681,6 @@ AudioDeviceGeneric::InitStatus AudioDeviceWindowsCore::Init() { |
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. |
@@ -3061,78 +3052,6 @@ 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 |
// ============================================================================ |
@@ -3522,11 +3441,8 @@ Exit: |
_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 |
{ |
@@ -3709,10 +3625,8 @@ DWORD AudioDeviceWindowsCore::DoCaptureThreadPollDMO() |
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 |
{ |
@@ -4012,11 +3926,8 @@ Exit: |
} |
} |
- // 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 |
{ |