Remove unnecessary fields from VoE SharedData.

webrtc/voice_engine/voe_hardware_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 339 matching lines @@
   }
 
   if (_shared->audio_device()->SetStereoRecording(available) != 0) {
     _shared->SetLastError(
         VE_SOUNDCARD_ERROR, kTraceWarning,
         "SetRecordingDevice() failed to set mono recording mode");
   }
 
   // Restore recording if it was enabled already when calling this function.
   if (isRecording) {
-    if (!_shared->ext_recording()) {
-      WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-                   "SetRecordingDevice() recording is now being restored...");
-      if (_shared->audio_device()->InitRecording() != 0) {
-        WEBRTC_TRACE(kTraceError, kTraceVoice,
-                     VoEId(_shared->instance_id(), -1),
-                     "SetRecordingDevice() failed to initialize recording");
-        return -1;
-      }
-      if (_shared->audio_device()->StartRecording() != 0) {
-        WEBRTC_TRACE(kTraceError, kTraceVoice,
-                     VoEId(_shared->instance_id(), -1),
-                     "SetRecordingDevice() failed to start recording");
-        return -1;
-      }
+    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
+                 "SetRecordingDevice() recording is now being restored...");
+    if (_shared->audio_device()->InitRecording() != 0) {
+      WEBRTC_TRACE(kTraceError, kTraceVoice,
+                   VoEId(_shared->instance_id(), -1),
+                   "SetRecordingDevice() failed to initialize recording");
+      return -1;
+    }
+    if (_shared->audio_device()->StartRecording() != 0) {
+      WEBRTC_TRACE(kTraceError, kTraceVoice,
+                   VoEId(_shared->instance_id(), -1),
+                   "SetRecordingDevice() failed to start recording");
+      return -1;
     }
   }
 
   return 0;
 }
 
 int VoEHardwareImpl::SetPlayoutDevice(int index) {
   WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "SetPlayoutDevice(index=%d)", index);
   CriticalSectionScoped cs(_shared->crit_sec());
@@ skipping 53 matching lines @@
   bool available = false;
   _shared->audio_device()->StereoPlayoutIsAvailable(&available);
   if (_shared->audio_device()->SetStereoPlayout(available) != 0) {
     _shared->SetLastError(
         VE_SOUNDCARD_ERROR, kTraceWarning,
         "SetPlayoutDevice() failed to set stereo playout mode");
   }
 
   // Restore playout if it was enabled already when calling this function.
   if (isPlaying) {
-    if (!_shared->ext_playout()) {
-      WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
-                   "SetPlayoutDevice() playout is now being restored...");
-      if (_shared->audio_device()->InitPlayout() != 0) {
-        WEBRTC_TRACE(kTraceError, kTraceVoice,
-                     VoEId(_shared->instance_id(), -1),
-                     "SetPlayoutDevice() failed to initialize playout");
-        return -1;
-      }
-      if (_shared->audio_device()->StartPlayout() != 0) {
-        WEBRTC_TRACE(kTraceError, kTraceVoice,
-                     VoEId(_shared->instance_id(), -1),
-                     "SetPlayoutDevice() failed to start playout");
-        return -1;
-      }
+    WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
+                 "SetPlayoutDevice() playout is now being restored...");
+    if (_shared->audio_device()->InitPlayout() != 0) {
+      WEBRTC_TRACE(kTraceError, kTraceVoice,
+                   VoEId(_shared->instance_id(), -1),
+                   "SetPlayoutDevice() failed to initialize playout");
+      return -1;
+    }
+    if (_shared->audio_device()->StartPlayout() != 0) {
+      WEBRTC_TRACE(kTraceError, kTraceVoice,
+                   VoEId(_shared->instance_id(), -1),
+                   "SetPlayoutDevice() failed to start playout");
+      return -1;
     }
   }
 
   return 0;
 }
 
 int VoEHardwareImpl::SetRecordingSampleRate(unsigned int samples_per_sec) {
   WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "%s", __FUNCTION__);
   if (!_shared->statistics().Initialized()) {
@@ skipping 45 matching lines @@
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
   }
   return _shared->audio_device()->EnableBuiltInAEC(enable);
 }
 
 #endif  // WEBRTC_VOICE_ENGINE_HARDWARE_API
 
 }  // namespace webrtc