Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(400)

Side by Side Diff: webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h

Issue 2985443002: Replace WEBRTC_TRACE logging in modules/audio_device/.. mac/ win/ (Closed)
Patch Set: Manual fixes. Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H 11 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H
12 #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H 12 #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H
13 13
14 #include "webrtc/modules/audio_device/include/audio_device.h" 14 #include "webrtc/modules/audio_device/include/audio_device.h"
15 #include "webrtc/rtc_base/criticalsection.h" 15 #include "webrtc/rtc_base/criticalsection.h"
16 #include "webrtc/system_wrappers/include/trace.h" 16 #include "webrtc/rtc_base/logging.h"
17 #include "webrtc/typedefs.h" 17 #include "webrtc/typedefs.h"
18 18
19 #include <CoreAudio/CoreAudio.h> 19 #include <CoreAudio/CoreAudio.h>
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 class AudioMixerManagerMac { 23 class AudioMixerManagerMac {
24 public: 24 public:
25 int32_t OpenSpeaker(AudioDeviceID deviceID); 25 int32_t OpenSpeaker(AudioDeviceID deviceID);
26 int32_t OpenMicrophone(AudioDeviceID deviceID); 26 int32_t OpenMicrophone(AudioDeviceID deviceID);
(...skipping 20 matching lines...) Expand all
47 int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const; 47 int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const;
48 int32_t MinMicrophoneVolume(uint32_t& minVolume) const; 48 int32_t MinMicrophoneVolume(uint32_t& minVolume) const;
49 int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const; 49 int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const;
50 int32_t Close(); 50 int32_t Close();
51 int32_t CloseSpeaker(); 51 int32_t CloseSpeaker();
52 int32_t CloseMicrophone(); 52 int32_t CloseMicrophone();
53 bool SpeakerIsInitialized() const; 53 bool SpeakerIsInitialized() const;
54 bool MicrophoneIsInitialized() const; 54 bool MicrophoneIsInitialized() const;
55 55
56 public: 56 public:
57 AudioMixerManagerMac(const int32_t id); 57 AudioMixerManagerMac();
58 ~AudioMixerManagerMac(); 58 ~AudioMixerManagerMac();
59 59
60 private: 60 private:
61 static void logCAMsg(const TraceLevel level, 61 static void logCAMsg(const rtc::LoggingSeverity sev,
62 const TraceModule module,
63 const int32_t id,
64 const char* msg, 62 const char* msg,
65 const char* err); 63 const char* err);
66 64
67 private: 65 private:
68 rtc::CriticalSection _critSect; 66 rtc::CriticalSection _critSect;
69 int32_t _id;
70 67
71 AudioDeviceID _inputDeviceID; 68 AudioDeviceID _inputDeviceID;
72 AudioDeviceID _outputDeviceID; 69 AudioDeviceID _outputDeviceID;
73 70
74 uint16_t _noInputChannels; 71 uint16_t _noInputChannels;
75 uint16_t _noOutputChannels; 72 uint16_t _noOutputChannels;
76 }; 73 };
77 74
78 } // namespace webrtc 75 } // namespace webrtc
79 76
80 #endif // AUDIO_MIXER_MAC_H 77 #endif // AUDIO_MIXER_MAC_H
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/mac/audio_device_mac.cc ('k') | webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698