| Index: media/audio/alsa/audio_manager_alsa.h
|
| diff --git a/media/audio/alsa/audio_manager_alsa.h b/media/audio/alsa/audio_manager_alsa.h
|
| index 40801fc5608ce97926ce8711a4aa9c59cc2b30fd..46a28b172fbbd21d689b1f91dd295e71dab5e077 100644
|
| --- a/media/audio/alsa/audio_manager_alsa.h
|
| +++ b/media/audio/alsa/audio_manager_alsa.h
|
| @@ -22,31 +22,31 @@ class MEDIA_EXPORT AudioManagerAlsa : public AudioManagerBase {
|
| static void ShowLinuxAudioInputSettings();
|
|
|
| // Implementation of AudioManager.
|
| - virtual bool HasAudioOutputDevices() override;
|
| - virtual bool HasAudioInputDevices() override;
|
| - virtual void ShowAudioInputSettings() override;
|
| - virtual void GetAudioInputDeviceNames(
|
| - AudioDeviceNames* device_names) override;
|
| - virtual void GetAudioOutputDeviceNames(
|
| - AudioDeviceNames* device_names) override;
|
| - virtual AudioParameters GetInputStreamParameters(
|
| + bool HasAudioOutputDevices() override;
|
| + bool HasAudioInputDevices() override;
|
| + void ShowAudioInputSettings() override;
|
| + void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
|
| + void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
|
| + AudioParameters GetInputStreamParameters(
|
| const std::string& device_id) override;
|
|
|
| // Implementation of AudioManagerBase.
|
| - virtual AudioOutputStream* MakeLinearOutputStream(
|
| + AudioOutputStream* MakeLinearOutputStream(
|
| const AudioParameters& params) override;
|
| - virtual AudioOutputStream* MakeLowLatencyOutputStream(
|
| + AudioOutputStream* MakeLowLatencyOutputStream(
|
| + const AudioParameters& params,
|
| + const std::string& device_id) override;
|
| + AudioInputStream* MakeLinearInputStream(
|
| + const AudioParameters& params,
|
| + const std::string& device_id) override;
|
| + AudioInputStream* MakeLowLatencyInputStream(
|
| const AudioParameters& params,
|
| const std::string& device_id) 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 ~AudioManagerAlsa();
|
| + ~AudioManagerAlsa() override;
|
|
|
| - virtual AudioParameters GetPreferredOutputStreamParameters(
|
| + AudioParameters GetPreferredOutputStreamParameters(
|
| const std::string& output_device_id,
|
| const AudioParameters& input_params) override;
|
|
|
|
|