| Index: media/audio/audio_output_controller.h
|
| diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h
|
| index 58e1e458a97e1ec06b5157706a62940919b7d2cc..394e11fed19b17005b76ade4538efbf908f6a8f4 100644
|
| --- a/media/audio/audio_output_controller.h
|
| +++ b/media/audio/audio_output_controller.h
|
| @@ -20,6 +20,7 @@
|
| #include "media/audio/audio_source_diverter.h"
|
| #include "media/audio/simple_sources.h"
|
| #include "media/base/media_export.h"
|
| +#include "media/mojo/interfaces/audio_output.mojom.h"
|
|
|
| // An AudioOutputController controls an AudioOutputStream and provides data
|
| // to this output stream. It has an important function that it executes
|
| @@ -67,7 +68,8 @@ class MEDIA_EXPORT AudioOutputController
|
| // following methods are called on the audio manager thread.
|
| class MEDIA_EXPORT EventHandler {
|
| public:
|
| - virtual void OnCreated() = 0;
|
| + virtual void OnCreated(
|
| + const content::mojom::AudioOutput::CreateStreamCallback& callback) = 0;
|
| virtual void OnPlaying() = 0;
|
| virtual void OnPaused() = 0;
|
| virtual void OnError() = 0;
|
| @@ -109,9 +111,12 @@ class MEDIA_EXPORT AudioOutputController
|
| // The |output_device_id| can be either empty (default device) or specify a
|
| // specific hardware device for audio output.
|
| static scoped_refptr<AudioOutputController> Create(
|
| - AudioManager* audio_manager, EventHandler* event_handler,
|
| - const AudioParameters& params, const std::string& output_device_id,
|
| - SyncReader* sync_reader);
|
| + AudioManager* audio_manager,
|
| + EventHandler* event_handler,
|
| + const AudioParameters& params,
|
| + const std::string& output_device_id,
|
| + SyncReader* sync_reader,
|
| + const content::mojom::AudioOutput::CreateStreamCallback& callback);
|
|
|
| // Indicates whether audio power level analysis will be performed. If false,
|
| // ReadCurrentPowerAndClip() can not be called.
|
| @@ -206,7 +211,9 @@ class MEDIA_EXPORT AudioOutputController
|
| SyncReader* sync_reader);
|
|
|
| // The following methods are executed on the audio manager thread.
|
| - void DoCreate(bool is_for_device_change);
|
| + void DoCreate(
|
| + bool is_for_device_change,
|
| + const content::mojom::AudioOutput::CreateStreamCallback& callback);
|
| void DoPlay();
|
| void DoPause();
|
| void DoClose();
|
|
|