Chromium Code Reviews| Index: media/audio/audio_output_controller.h |
| diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h |
| index 1f5c358ae3cedc04cc4ca90ea3aeb468ff7b335f..925b9f50b83acdde62a7c26bc938f0400039b76c 100644 |
| --- a/media/audio/audio_output_controller.h |
| +++ b/media/audio/audio_output_controller.h |
| @@ -6,8 +6,8 @@ |
| #define MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_ |
| #include <stdint.h> |
| - |
| #include <memory> |
| +#include <set> |
| #include "base/atomic_ref_count.h" |
| #include "base/callback.h" |
| @@ -21,6 +21,7 @@ |
| #include "media/audio/audio_power_monitor.h" |
| #include "media/audio/audio_source_diverter.h" |
| #include "media/audio/simple_sources.h" |
| +#include "media/audio/virtual_audio_sink.h" |
| #include "media/base/media_export.h" |
| // An AudioOutputController controls an AudioOutputStream and provides data |
| @@ -178,6 +179,8 @@ class MEDIA_EXPORT AudioOutputController |
| const AudioParameters& GetAudioParameters() override; |
| void StartDiverting(AudioOutputStream* to_stream) override; |
| void StopDiverting() override; |
| + void StartDuplicating(AudioPushSink* sink) override; |
| + void StopDuplicating(AudioPushSink* sink) override; |
| // Accessor for AudioPowerMonitor::ReadCurrentPowerAndClip(). See comments in |
| // audio_power_monitor.h for usage. This may be called on any thread. |
| @@ -218,12 +221,14 @@ class MEDIA_EXPORT AudioOutputController |
| void DoReportError(); |
| void DoStartDiverting(AudioOutputStream* to_stream); |
| void DoStopDiverting(); |
| + void DoStartDuplicating(AudioPushSink* sink); |
| + void DoStopDuplicating(AudioPushSink* sink); |
| // Helper method that stops the physical stream. |
| void StopStream(); |
| // Helper method that stops, closes, and NULLs |*stream_|. |
| - void DoStopCloseAndClearStream(); |
| + void DoStopCloseAndClearStream(bool isForDeviceChange); |
| // Checks if a stream was started successfully but never calls OnMoreData(). |
| void WedgeCheck(); |
| @@ -241,6 +246,9 @@ class MEDIA_EXPORT AudioOutputController |
| // When non-NULL, audio is being diverted to this stream. |
| AudioOutputStream* diverting_to_stream_; |
| + // The targets for audio stream to be copied to. |
| + std::set<AudioPushSink*> duplicating_targets_; |
|
miu
2016/05/02 20:06:13
naming nit: duplication_targets_
qiangchen
2016/05/03 16:58:23
Done.
|
| + |
| // The current volume of the audio stream. |
| double volume_; |