Index: media/base/audio_renderer_mixer_input.h |
diff --git a/media/base/audio_renderer_mixer_input.h b/media/base/audio_renderer_mixer_input.h |
index 34f37c5ee00a3c0d0803ef4f807992942bbf8401..e5b93a22839792dd366a4bf7c01e47f141bef92a 100644 |
--- a/media/base/audio_renderer_mixer_input.h |
+++ b/media/base/audio_renderer_mixer_input.h |
@@ -11,7 +11,6 @@ |
#include "base/macros.h" |
#include "media/base/audio_converter.h" |
#include "media/base/audio_renderer_sink.h" |
-#include "media/base/output_device.h" |
#include "url/origin.h" |
namespace media { |
@@ -19,8 +18,7 @@ namespace media { |
class AudioRendererMixer; |
class MEDIA_EXPORT AudioRendererMixerInput |
- : NON_EXPORTED_BASE(public RestartableAudioRendererSink), |
- NON_EXPORTED_BASE(public OutputDevice), |
+ : NON_EXPORTED_BASE(public SwitchableAudioRendererSink), |
public AudioConverter::InputCallback { |
public: |
typedef base::Callback<AudioRendererMixer*(const AudioParameters& params, |
@@ -33,32 +31,23 @@ class MEDIA_EXPORT AudioRendererMixerInput |
const url::Origin& security_origin)> |
RemoveMixerCB; |
- typedef base::Callback<AudioParameters(const std::string& device_id, |
- const url::Origin& security_origin)> |
- GetHardwareParamsCB; |
- |
AudioRendererMixerInput(const GetMixerCB& get_mixer_cb, |
const RemoveMixerCB& remove_mixer_cb, |
- const GetHardwareParamsCB& get_hardware_params_cb, |
const std::string& device_id, |
const url::Origin& security_origin); |
- // RestartableAudioRendererSink implementation. |
+ // SwitchableAudioRendererSink implementation. |
void Start() override; |
void Stop() override; |
void Play() override; |
void Pause() override; |
bool SetVolume(double volume) override; |
- OutputDevice* GetOutputDevice() override; |
+ OutputDeviceInfo GetOutputDeviceInfo() override; |
void Initialize(const AudioParameters& params, |
AudioRendererSink::RenderCallback* renderer) override; |
- |
- // OutputDevice implementation. |
void SwitchOutputDevice(const std::string& device_id, |
const url::Origin& security_origin, |
- const SwitchOutputDeviceCB& callback) override; |
- AudioParameters GetOutputParameters() override; |
- OutputDeviceStatus GetDeviceStatus() override; |
+ const OutputDeviceStatusCB& callback) override; |
// Called by AudioRendererMixer when an error occurs. |
void OnRenderError(); |
@@ -82,10 +71,6 @@ class MEDIA_EXPORT AudioRendererMixerInput |
const GetMixerCB get_mixer_cb_; |
const RemoveMixerCB remove_mixer_cb_; |
- // Callbacks provided during construction which allows AudioRendererMixerInput |
- // to access hardware output parameters when it is detached from the mixer. |
- const GetHardwareParamsCB get_hardware_params_cb_; |
- |
// AudioParameters received during Initialize(). |
AudioParameters params_; |
@@ -105,7 +90,7 @@ class MEDIA_EXPORT AudioRendererMixerInput |
// Pending switch-device callback, in case SwitchOutputDevice() is invoked |
// before Start() |
- SwitchOutputDeviceCB pending_switch_callback_; |
+ OutputDeviceStatusCB pending_switch_callback_; |
std::string pending_switch_device_id_; |
url::Origin pending_switch_security_origin_; |