Move WEBRTC_VOICE_ENGINE_TYPING_DETECTION to transmit_mixer.h

webrtc/voice_engine/voe_audio_processing_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 663 matching lines @@
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
   }
 
   return _shared->audio_processing()->StopDebugRecording();
 }
 
 int VoEAudioProcessingImpl::SetTypingDetectionStatus(bool enable) {
   WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "SetTypingDetectionStatus()");
-#if !defined(WEBRTC_VOICE_ENGINE_TYPING_DETECTION)
+#if !WEBRTC_VOICE_ENGINE_TYPING_DETECTION
   NOT_SUPPORTED(_shared->statistics());
 #else
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
   }
 
   // Just use the VAD state to determine if we should enable typing detection
   // or not
 
@@ skipping 21 matching lines @@
   }
   // Just use the VAD state to determine if we should enable typing
   // detection or not
 
   enabled = _shared->audio_processing()->voice_detection()->is_enabled();
 
   return 0;
 }
 
 int VoEAudioProcessingImpl::TimeSinceLastTyping(int& seconds) {
-#if !defined(WEBRTC_VOICE_ENGINE_TYPING_DETECTION)
+#if !WEBRTC_VOICE_ENGINE_TYPING_DETECTION
   NOT_SUPPORTED(_shared->statistics());
 #else
   if (!_shared->statistics().Initialized()) {
     _shared->SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
   }
   // Check if typing detection is enabled
   bool enabled = _shared->audio_processing()->voice_detection()->is_enabled();
   if (enabled) {
     _shared->transmit_mixer()->TimeSinceLastTyping(seconds);
     return 0;
   } else {
     _shared->SetLastError(VE_FUNC_NOT_SUPPORTED, kTraceError,
                           "SetTypingDetectionStatus is not enabled");
     return -1;
   }
 #endif
 }
 
 int VoEAudioProcessingImpl::SetTypingDetectionParameters(int timeWindow,
                                                          int costPerTyping,
                                                          int reportingThreshold,
                                                          int penaltyDecay,
                                                          int typeEventDelay) {
   WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "SetTypingDetectionParameters()");
-#if !defined(WEBRTC_VOICE_ENGINE_TYPING_DETECTION)
+#if !WEBRTC_VOICE_ENGINE_TYPING_DETECTION
   NOT_SUPPORTED(_shared->statistics());
 #else
   if (!_shared->statistics().Initialized()) {
     _shared->statistics().SetLastError(VE_NOT_INITED, kTraceError);
     return -1;
   }
   return (_shared->transmit_mixer()->SetTypingDetectionParameters(
       timeWindow, costPerTyping, reportingThreshold, penaltyDecay,
       typeEventDelay));
 #endif
 }
 
 void VoEAudioProcessingImpl::EnableStereoChannelSwapping(bool enable) {
   _shared->transmit_mixer()->EnableStereoChannelSwapping(enable);
 }
 
 bool VoEAudioProcessingImpl::IsStereoChannelSwappingEnabled() {
   return _shared->transmit_mixer()->IsStereoChannelSwappingEnabled();
 }
 
 }  // namespace webrtc