| Index: media/audio/audio_manager_base.h
|
| diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
|
| index a80f63c1aef6b8b5150aadb7a7b077907f37bf4c..91a9c8ce17ac495ce3bed344200e66c4a785e41a 100644
|
| --- a/media/audio/audio_manager_base.h
|
| +++ b/media/audio/audio_manager_base.h
|
| @@ -34,15 +34,6 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
|
| public:
|
| ~AudioManagerBase() override;
|
|
|
| - // AudioManager:
|
| - base::string16 GetAudioInputDeviceModel() override;
|
| - void ShowAudioInputSettings() override;
|
| -
|
| - void GetAudioInputDeviceDescriptions(
|
| - AudioDeviceDescriptions* device_descriptions) final;
|
| - void GetAudioOutputDeviceDescriptions(
|
| - AudioDeviceDescriptions* device_descriptions) final;
|
| -
|
| AudioOutputStream* MakeAudioOutputStream(
|
| const AudioParameters& params,
|
| const std::string& device_id,
|
| @@ -59,13 +50,6 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
|
| void AddOutputDeviceChangeListener(AudioDeviceListener* listener) override;
|
| void RemoveOutputDeviceChangeListener(AudioDeviceListener* listener) override;
|
|
|
| - AudioParameters GetDefaultOutputStreamParameters() override;
|
| - AudioParameters GetOutputStreamParameters(
|
| - const std::string& device_id) override;
|
| - AudioParameters GetInputStreamParameters(
|
| - const std::string& device_id) override;
|
| - std::string GetAssociatedOutputDeviceID(
|
| - const std::string& input_device_id) override;
|
| std::unique_ptr<AudioLog> CreateAudioLog(
|
| AudioLogFactory::AudioComponent component) override;
|
| void EnableOutputDebugRecording(const base::FilePath& base_file_name) final;
|
| @@ -116,6 +100,23 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
|
| scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
|
| AudioLogFactory* audio_log_factory);
|
|
|
| + // AudioManager:
|
| + base::string16 GetAudioInputDeviceModel() override;
|
| + void ShowAudioInputSettings() override;
|
| +
|
| + void GetAudioInputDeviceDescriptions(
|
| + AudioDeviceDescriptions* device_descriptions) final;
|
| + void GetAudioOutputDeviceDescriptions(
|
| + AudioDeviceDescriptions* device_descriptions) final;
|
| +
|
| + AudioParameters GetDefaultOutputStreamParameters() override;
|
| + AudioParameters GetOutputStreamParameters(
|
| + const std::string& device_id) override;
|
| + AudioParameters GetInputStreamParameters(
|
| + const std::string& device_id) override;
|
| + std::string GetAssociatedOutputDeviceID(
|
| + const std::string& input_device_id) override;
|
| +
|
| // Releases all the audio output dispatchers.
|
| // All audio streams should be closed before Shutdown() is called.
|
| // This must be called in the destructor of every AudioManagerBase
|
|
|