| Index: media/audio/linux/audio_manager_linux.h
|
| diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
|
| index d4d4bb1fd7a5fee63320fbb27fb5d718b36608fe..0dd3b7e565a5295f72b3767f40a39eda718bbeba 100644
|
| --- a/media/audio/linux/audio_manager_linux.h
|
| +++ b/media/audio/linux/audio_manager_linux.h
|
| @@ -23,19 +23,23 @@ class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
|
| // Implementation of AudioManager.
|
| virtual bool HasAudioOutputDevices() OVERRIDE;
|
| virtual bool HasAudioInputDevices() OVERRIDE;
|
| - virtual AudioOutputStream* MakeAudioOutputStream(
|
| - const AudioParameters& params) OVERRIDE;
|
| - virtual AudioInputStream* MakeAudioInputStream(
|
| - const AudioParameters& params, const std::string& device_id) OVERRIDE;
|
| virtual bool CanShowAudioInputSettings() OVERRIDE;
|
| virtual void ShowAudioInputSettings() OVERRIDE;
|
| virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)
|
| OVERRIDE;
|
| -
|
| virtual void MuteAll() OVERRIDE;
|
| virtual void UnMuteAll() OVERRIDE;
|
|
|
| - virtual void ReleaseOutputStream(AudioOutputStream* stream);
|
| + // Implementation of AudioManagerBase.
|
| + virtual int GetMaxOutputStreamsAllowed() OVERRIDE;
|
| + virtual AudioOutputStream* MakeLinearOutputStream(
|
| + const AudioParameters& params) OVERRIDE;
|
| + virtual AudioOutputStream* MakeLowLatencyOutputStream(
|
| + const AudioParameters& params) OVERRIDE;
|
| + virtual AudioInputStream* MakeLinearInputStream(
|
| + const AudioParameters& params, const std::string& device_id) OVERRIDE;
|
| + virtual AudioInputStream* MakeLowLatencyInputStream(
|
| + const AudioParameters& params, const std::string& device_id) OVERRIDE;
|
|
|
| protected:
|
| virtual ~AudioManagerLinux();
|
| @@ -58,9 +62,14 @@ class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
|
| // Returns true if a device is present for the given stream type.
|
| bool HasAnyAlsaAudioDevice(StreamType stream);
|
|
|
| - scoped_ptr<AlsaWrapper> wrapper_;
|
| + // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
|
| + AudioOutputStream* MakeOutputStream(const AudioParameters& params);
|
|
|
| - size_t active_output_stream_count_;
|
| + // Called by MakeLinearInputStream and MakeLowLatencyInputStream.
|
| + AudioInputStream* MakeInputStream(const AudioParameters& params,
|
| + const std::string& device_id);
|
| +
|
| + scoped_ptr<AlsaWrapper> wrapper_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AudioManagerLinux);
|
| };
|
|
|