Commit 44e69ab5 authored by Olga Sharonova's avatar Olga Sharonova Committed by Commit Bot

Remove unused MediaStreamAudioRenderer::GetOutputDeviceInfo

I don't recall how it was used before; but apparently it's not used any more.

Bug: 914323
Change-Id: I4c9bd365b4f2331999b973dfd09bba0dc1ced279
Reviewed-on: https://chromium-review.googlesource.com/c/1373833Reviewed-by: default avatarMax Morin <maxmorin@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: Olga Sharonova <olka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615883}
parent ba460856
...@@ -33,13 +33,6 @@ class MediaStreamAudioRenderer ...@@ -33,13 +33,6 @@ class MediaStreamAudioRenderer
// Sets the output volume. // Sets the output volume.
virtual void SetVolume(float volume) = 0; virtual void SetVolume(float volume) = 0;
// Returns current output device information. If the information is not
// available yet, this method may block until it becomes available.
// If the renderer is not associated with any output device, |device_status|
// of OutputDeviceInfo should be set to OUTPUT_DEVICE_STATUS_ERROR_INTERNAL.
// Must never be called on the IO thread.
virtual media::OutputDeviceInfo GetOutputDeviceInfo() = 0;
// Attempts to switch the audio output device. // Attempts to switch the audio output device.
// Once the attempt is finished, |callback| is invoked with the result of the // Once the attempt is finished, |callback| is invoked with the result of the
// operation passed as a parameter. The result is a value from the // operation passed as a parameter. The result is a value from the
......
...@@ -218,11 +218,6 @@ void TrackAudioRenderer::SetVolume(float volume) { ...@@ -218,11 +218,6 @@ void TrackAudioRenderer::SetVolume(float volume) {
sink_->SetVolume(volume); sink_->SetVolume(volume);
} }
media::OutputDeviceInfo TrackAudioRenderer::GetOutputDeviceInfo() {
DCHECK(task_runner_->BelongsToCurrentThread());
return sink_ ? sink_->GetOutputDeviceInfo() : media::OutputDeviceInfo();
}
base::TimeDelta TrackAudioRenderer::GetCurrentRenderTime() { base::TimeDelta TrackAudioRenderer::GetCurrentRenderTime() {
DCHECK(task_runner_->BelongsToCurrentThread()); DCHECK(task_runner_->BelongsToCurrentThread());
base::AutoLock auto_lock(thread_lock_); base::AutoLock auto_lock(thread_lock_);
......
...@@ -73,7 +73,6 @@ class CONTENT_EXPORT TrackAudioRenderer ...@@ -73,7 +73,6 @@ class CONTENT_EXPORT TrackAudioRenderer
void Play() override; void Play() override;
void Pause() override; void Pause() override;
void SetVolume(float volume) override; void SetVolume(float volume) override;
media::OutputDeviceInfo GetOutputDeviceInfo() override;
base::TimeDelta GetCurrentRenderTime() override; base::TimeDelta GetCurrentRenderTime() override;
bool IsLocalRenderer() override; bool IsLocalRenderer() override;
void SwitchOutputDevice(const std::string& device_id, void SwitchOutputDevice(const std::string& device_id,
......
...@@ -277,9 +277,6 @@ class MockMediaStreamAudioRenderer : public MediaStreamAudioRenderer { ...@@ -277,9 +277,6 @@ class MockMediaStreamAudioRenderer : public MediaStreamAudioRenderer {
void Play() override {} void Play() override {}
void Pause() override {} void Pause() override {}
void SetVolume(float volume) override {} void SetVolume(float volume) override {}
media::OutputDeviceInfo GetOutputDeviceInfo() override {
return media::OutputDeviceInfo();
}
void SwitchOutputDevice(const std::string& device_id, void SwitchOutputDevice(const std::string& device_id,
media::OutputDeviceStatusCB callback) override {} media::OutputDeviceStatusCB callback) override {}
......
...@@ -120,11 +120,6 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer { ...@@ -120,11 +120,6 @@ class SharedAudioRenderer : public MediaStreamAudioRenderer {
on_play_state_changed_.Run(media_stream_, &playing_state_); on_play_state_changed_.Run(media_stream_, &playing_state_);
} }
media::OutputDeviceInfo GetOutputDeviceInfo() override {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
return delegate_->GetOutputDeviceInfo();
}
void SwitchOutputDevice(const std::string& device_id, void SwitchOutputDevice(const std::string& device_id,
media::OutputDeviceStatusCB callback) override { media::OutputDeviceStatusCB callback) override {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
...@@ -349,11 +344,6 @@ void WebRtcAudioRenderer::SetVolume(float volume) { ...@@ -349,11 +344,6 @@ void WebRtcAudioRenderer::SetVolume(float volume) {
OnPlayStateChanged(media_stream_, &playing_state_); OnPlayStateChanged(media_stream_, &playing_state_);
} }
media::OutputDeviceInfo WebRtcAudioRenderer::GetOutputDeviceInfo() {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
return sink_ ? sink_->GetOutputDeviceInfo() : media::OutputDeviceInfo();
}
base::TimeDelta WebRtcAudioRenderer::GetCurrentRenderTime() { base::TimeDelta WebRtcAudioRenderer::GetCurrentRenderTime() {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
base::AutoLock auto_lock(lock_); base::AutoLock auto_lock(lock_);
......
...@@ -121,7 +121,6 @@ class CONTENT_EXPORT WebRtcAudioRenderer ...@@ -121,7 +121,6 @@ class CONTENT_EXPORT WebRtcAudioRenderer
void Pause() override; void Pause() override;
void Stop() override; void Stop() override;
void SetVolume(float volume) override; void SetVolume(float volume) override;
media::OutputDeviceInfo GetOutputDeviceInfo() override;
base::TimeDelta GetCurrentRenderTime() override; base::TimeDelta GetCurrentRenderTime() override;
bool IsLocalRenderer() override; bool IsLocalRenderer() override;
void SwitchOutputDevice(const std::string& device_id, void SwitchOutputDevice(const std::string& device_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment