| Index: webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h
|
| diff --git a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h
|
| index 17e7b25e1d9228379ad50e0527a195da5cc23913..b74fe660ee3091a23d21a8f2ad6594b2712f3248 100644
|
| --- a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h
|
| +++ b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h
|
| @@ -13,7 +13,7 @@
|
|
|
| #include "webrtc/modules/audio_device/include/audio_device.h"
|
| #include "webrtc/rtc_base/criticalsection.h"
|
| -#include "webrtc/system_wrappers/include/trace.h"
|
| +#include "webrtc/rtc_base/logging.h"
|
| #include "webrtc/typedefs.h"
|
|
|
| #include <CoreAudio/CoreAudio.h>
|
| @@ -54,19 +54,16 @@ class AudioMixerManagerMac {
|
| bool MicrophoneIsInitialized() const;
|
|
|
| public:
|
| - AudioMixerManagerMac(const int32_t id);
|
| + AudioMixerManagerMac();
|
| ~AudioMixerManagerMac();
|
|
|
| private:
|
| - 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);
|
|
|
| private:
|
| rtc::CriticalSection _critSect;
|
| - int32_t _id;
|
|
|
| AudioDeviceID _inputDeviceID;
|
| AudioDeviceID _outputDeviceID;
|
|
|