Replace WEBRTC_TRACE logging in modules/audio_device/.. mac/ win/

webrtc/modules/audio_device/mac/audio_device_mac.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_MAC_H
 
 #include <memory>
 
 #include "webrtc/modules/audio_device/audio_device_generic.h"
 #include "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h"
 #include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/logging.h"
 #include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 
 #include <AudioToolbox/AudioConverter.h>
 #include <CoreAudio/CoreAudio.h>
 #include <mach/semaphore.h>
 
 struct PaUtilRingBuffer;
 
 namespace rtc {
@@ skipping 25 matching lines @@
 
 const uint32_t REC_BUF_SIZE_IN_SAMPLES =
     ENGINE_REC_BUF_SIZE_IN_SAMPLES * N_DEVICE_CHANNELS * N_BUFFERS_IN;
 const uint32_t PLAY_BUF_SIZE_IN_SAMPLES =
     ENGINE_PLAY_BUF_SIZE_IN_SAMPLES * N_PLAY_CHANNELS * N_BUFFERS_OUT;
 
 const int kGetMicVolumeIntervalMs = 1000;
 
 class AudioDeviceMac : public AudioDeviceGeneric {
  public:
-  AudioDeviceMac(const int32_t id);
+  AudioDeviceMac();
   ~AudioDeviceMac();
 
   // Retrieve the currently utilized audio layer
   virtual int32_t ActiveAudioLayer(
       AudioDeviceModule::AudioLayer& audioLayer) const;
 
   // Main initializaton and termination
   virtual InitStatus Init();
   virtual int32_t Terminate();
   virtual bool Initialized() const;
@@ skipping 107 matching lines @@
 
   virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer);
 
  private:
   virtual int32_t MicrophoneIsAvailable(bool& available);
   virtual int32_t SpeakerIsAvailable(bool& available);
 
   static void AtomicSet32(int32_t* theValue, int32_t newValue);
   static int32_t AtomicGet32(int32_t* theValue);
 
-  static void logCAMsg(const TraceLevel level,
-                       const TraceModule module,
-                       const int32_t id,
+  static void logCAMsg(const rtc::LoggingSeverity sev,
                        const char* msg,
                        const char* err);
 
   int32_t GetNumberDevices(const AudioObjectPropertyScope scope,
                            AudioDeviceID scopedDeviceIds[],
                            const uint32_t deviceListLength);
 
   int32_t GetDeviceName(const AudioObjectPropertyScope scope,
                         const uint16_t index,
                         char* name);
@@ skipping 85 matching lines @@
   EventWrapper& _stopEvent;
 
   // TODO(pbos): Replace with direct members, just start/stop, no need to
   // recreate the thread.
   // Only valid/running between calls to StartRecording and StopRecording.
   std::unique_ptr<rtc::PlatformThread> capture_worker_thread_;
 
   // Only valid/running between calls to StartPlayout and StopPlayout.
   std::unique_ptr<rtc::PlatformThread> render_worker_thread_;
 
-  int32_t _id;
-
   AudioMixerManagerMac _mixerManager;
 
   uint16_t _inputDeviceIndex;
   uint16_t _outputDeviceIndex;
   AudioDeviceID _inputDeviceID;
   AudioDeviceID _outputDeviceID;
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
   AudioDeviceIOProcID _inDeviceIOProcID;
   AudioDeviceIOProcID _deviceIOProcID;
 #endif
@@ skipping 64 matching lines @@
   // Typing detection
   // 0x5c is key "9", after that comes function keys.
   bool prev_key_state_[0x5d];
 
   int get_mic_volume_counter_ms_;
 };
 
 }  // namespace webrtc
 
 #endif  // MODULES_AUDIO_DEVICE_MAIN_SOURCE_MAC_AUDIO_DEVICE_MAC_H_