| Index: media/audio/audio_system.h
|
| diff --git a/media/audio/audio_system.h b/media/audio/audio_system.h
|
| index 66dc622db267575d189e74adc5fb4729c6fbc6c7..a4b991257a2d953eac02dface166685698e539e8 100644
|
| --- a/media/audio/audio_system.h
|
| +++ b/media/audio/audio_system.h
|
| @@ -6,6 +6,7 @@
|
| #define MEDIA_AUDIO_AUDIO_SYSTEM_H_
|
|
|
| #include "base/callback.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "media/audio/audio_device_description.h"
|
| #include "media/base/audio_parameters.h"
|
| #include "media/base/media_export.h"
|
| @@ -29,6 +30,9 @@ class MEDIA_EXPORT AudioSystem {
|
| using OnBoolCallback = base::Callback<void(bool)>;
|
| using OnDeviceDescriptionsCallback =
|
| base::Callback<void(AudioDeviceDescriptions)>;
|
| + using OnDeviceIdCallback = base::Callback<void(const std::string&)>;
|
| + using OnInputDeviceInfoCallback = base::Callback<
|
| + void(const AudioParameters&, const AudioParameters&, const std::string&)>;
|
|
|
| static AudioSystem* Get();
|
|
|
| @@ -59,9 +63,21 @@ class MEDIA_EXPORT AudioSystem {
|
| // Replies with device descriptions of input audio devices if |for_input| is
|
| // true, and of output audio devices otherwise.
|
| virtual void GetDeviceDescriptions(
|
| - OnDeviceDescriptionsCallback on_descriptions_cp,
|
| + OnDeviceDescriptionsCallback on_descriptions_cb,
|
| bool for_input) = 0;
|
|
|
| + // Replies with an empty string if there is no associated output device found.
|
| + virtual void GetAssociatedOutputDeviceID(
|
| + const std::string& input_device_id,
|
| + OnDeviceIdCallback on_device_id_cb) = 0;
|
| +
|
| + // Replies with audio parameters for the specified input device and audio
|
| + // parameters and device ID of the associated output device, if any (otherwise
|
| + // it's AudioParameters() and an empty string).
|
| + virtual void GetInputDeviceInfo(
|
| + const std::string& input_device_id,
|
| + OnInputDeviceInfoCallback on_input_device_info_cb) = 0;
|
| +
|
| virtual base::SingleThreadTaskRunner* GetTaskRunner() const = 0;
|
|
|
| // Must not be used for anything but stream creation.
|
|
|