| 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 94d6928921bc03f951810b1b158859ff5e148925..9cbfe2deb404268384e4d28da237d96d7bcc1a3c 100644
|
| --- a/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h
|
| +++ b/webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h
|
| @@ -18,63 +18,62 @@
|
| #include <CoreAudio/CoreAudio.h>
|
|
|
| namespace webrtc {
|
| -
|
| -class AudioMixerManagerMac
|
| -{
|
| -public:
|
| - int32_t OpenSpeaker(AudioDeviceID deviceID);
|
| - int32_t OpenMicrophone(AudioDeviceID deviceID);
|
| - int32_t SetSpeakerVolume(uint32_t volume);
|
| - int32_t SpeakerVolume(uint32_t& volume) const;
|
| - int32_t MaxSpeakerVolume(uint32_t& maxVolume) const;
|
| - int32_t MinSpeakerVolume(uint32_t& minVolume) const;
|
| - int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const;
|
| - int32_t SpeakerVolumeIsAvailable(bool& available);
|
| - int32_t SpeakerMuteIsAvailable(bool& available);
|
| - int32_t SetSpeakerMute(bool enable);
|
| - int32_t SpeakerMute(bool& enabled) const;
|
| - int32_t StereoPlayoutIsAvailable(bool& available);
|
| - int32_t StereoRecordingIsAvailable(bool& available);
|
| - int32_t MicrophoneMuteIsAvailable(bool& available);
|
| - int32_t SetMicrophoneMute(bool enable);
|
| - int32_t MicrophoneMute(bool& enabled) const;
|
| - int32_t MicrophoneBoostIsAvailable(bool& available);
|
| - int32_t SetMicrophoneBoost(bool enable);
|
| - int32_t MicrophoneBoost(bool& enabled) const;
|
| - int32_t MicrophoneVolumeIsAvailable(bool& available);
|
| - int32_t SetMicrophoneVolume(uint32_t volume);
|
| - int32_t MicrophoneVolume(uint32_t& volume) const;
|
| - int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const;
|
| - int32_t MinMicrophoneVolume(uint32_t& minVolume) const;
|
| - int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const;
|
| - int32_t Close();
|
| - int32_t CloseSpeaker();
|
| - int32_t CloseMicrophone();
|
| - bool SpeakerIsInitialized() const;
|
| - bool MicrophoneIsInitialized() const;
|
|
|
| -public:
|
| - AudioMixerManagerMac(const int32_t id);
|
| - ~AudioMixerManagerMac();
|
| +class AudioMixerManagerMac {
|
| + public:
|
| + int32_t OpenSpeaker(AudioDeviceID deviceID);
|
| + int32_t OpenMicrophone(AudioDeviceID deviceID);
|
| + int32_t SetSpeakerVolume(uint32_t volume);
|
| + int32_t SpeakerVolume(uint32_t& volume) const;
|
| + int32_t MaxSpeakerVolume(uint32_t& maxVolume) const;
|
| + int32_t MinSpeakerVolume(uint32_t& minVolume) const;
|
| + int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const;
|
| + int32_t SpeakerVolumeIsAvailable(bool& available);
|
| + int32_t SpeakerMuteIsAvailable(bool& available);
|
| + int32_t SetSpeakerMute(bool enable);
|
| + int32_t SpeakerMute(bool& enabled) const;
|
| + int32_t StereoPlayoutIsAvailable(bool& available);
|
| + int32_t StereoRecordingIsAvailable(bool& available);
|
| + int32_t MicrophoneMuteIsAvailable(bool& available);
|
| + int32_t SetMicrophoneMute(bool enable);
|
| + int32_t MicrophoneMute(bool& enabled) const;
|
| + int32_t MicrophoneBoostIsAvailable(bool& available);
|
| + int32_t SetMicrophoneBoost(bool enable);
|
| + int32_t MicrophoneBoost(bool& enabled) const;
|
| + int32_t MicrophoneVolumeIsAvailable(bool& available);
|
| + int32_t SetMicrophoneVolume(uint32_t volume);
|
| + int32_t MicrophoneVolume(uint32_t& volume) const;
|
| + int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const;
|
| + int32_t MinMicrophoneVolume(uint32_t& minVolume) const;
|
| + int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const;
|
| + int32_t Close();
|
| + int32_t CloseSpeaker();
|
| + int32_t CloseMicrophone();
|
| + bool SpeakerIsInitialized() const;
|
| + bool MicrophoneIsInitialized() const;
|
|
|
| -private:
|
| - static void logCAMsg(const TraceLevel level,
|
| - const TraceModule module,
|
| - const int32_t id, const char *msg,
|
| - const char *err);
|
| + public:
|
| + AudioMixerManagerMac(const int32_t id);
|
| + ~AudioMixerManagerMac();
|
|
|
| -private:
|
| - CriticalSectionWrapper& _critSect;
|
| - int32_t _id;
|
| + private:
|
| + static void logCAMsg(const TraceLevel level,
|
| + const TraceModule module,
|
| + const int32_t id,
|
| + const char* msg,
|
| + const char* err);
|
|
|
| - AudioDeviceID _inputDeviceID;
|
| - AudioDeviceID _outputDeviceID;
|
| + private:
|
| + CriticalSectionWrapper& _critSect;
|
| + int32_t _id;
|
|
|
| - uint16_t _noInputChannels;
|
| - uint16_t _noOutputChannels;
|
| + AudioDeviceID _inputDeviceID;
|
| + AudioDeviceID _outputDeviceID;
|
|
|
| + uint16_t _noInputChannels;
|
| + uint16_t _noOutputChannels;
|
| };
|
| -
|
| +
|
| } // namespace webrtc
|
|
|
| #endif // AUDIO_MIXER_MAC_H
|
|
|