| Index: media/audio/mac/audio_manager_mac.h
|
| diff --git a/media/audio/mac/audio_manager_mac.h b/media/audio/mac/audio_manager_mac.h
|
| index 2060b6631bcf76b44481fba3e84a3a325d859ecd..660b4b2117fbd5c7648d2fb5f43f813998a540f6 100644
|
| --- a/media/audio/mac/audio_manager_mac.h
|
| +++ b/media/audio/mac/audio_manager_mac.h
|
| @@ -21,27 +21,24 @@ class AudioManagerMac : public AudioManagerBase {
|
| virtual bool HasAudioInputDevices() OVERRIDE;
|
| virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)
|
| OVERRIDE;
|
| - virtual AudioOutputStream* MakeAudioOutputStream(
|
| - const AudioParameters& params) OVERRIDE;
|
| - virtual AudioInputStream* MakeAudioInputStream(
|
| - const AudioParameters& params, const std::string& device_id) OVERRIDE;
|
| virtual void MuteAll() OVERRIDE;
|
| virtual void UnMuteAll() OVERRIDE;
|
|
|
| - // Mac-only method to free the streams created by above facoty methods.
|
| - // They are called internally by the respective audio stream when it has
|
| - // been closed.
|
| - void ReleaseOutputStream(AudioOutputStream* stream);
|
| - void ReleaseInputStream(AudioInputStream* stream);
|
| + // Implementation of AudioManagerBase.
|
| + virtual int GetMaxAudioOutputStreamsAllowed() OVERRIDE;
|
| + virtual AudioOutputStream* MakeAudioLinearOutputStream(
|
| + const AudioParameters& params) OVERRIDE;
|
| + virtual AudioOutputStream* MakeAudioLowLatencyOutputStream(
|
| + const AudioParameters& params) OVERRIDE;
|
| + virtual AudioInputStream* MakeAudioLinearInputStream(
|
| + const AudioParameters& params, const std::string& device_id) OVERRIDE;
|
| + virtual AudioInputStream* MakeAudioLowLatencyInputStream(
|
| + const AudioParameters& params, const std::string& device_id) OVERRIDE;
|
|
|
| protected:
|
| virtual ~AudioManagerMac();
|
|
|
| private:
|
| -
|
| - // Number of currently open output streams.
|
| - size_t num_output_streams_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(AudioManagerMac);
|
| };
|
|
|
|
|