Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1013)

Unified Diff: media/base/fake_audio_renderer_sink.cc

Issue 1809093003: Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/fake_audio_renderer_sink.h ('k') | media/base/fake_output_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/fake_audio_renderer_sink.cc
diff --git a/media/base/fake_audio_renderer_sink.cc b/media/base/fake_audio_renderer_sink.cc
index 5ce60740b05db9416cde068aac1a693a417d6525..40c3cdf9c270e8de6c0796700342da302d2f0069 100644
--- a/media/base/fake_audio_renderer_sink.cc
+++ b/media/base/fake_audio_renderer_sink.cc
@@ -7,15 +7,20 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/single_thread_task_runner.h"
-#include "media/base/fake_output_device.h"
namespace media {
FakeAudioRendererSink::FakeAudioRendererSink()
: state_(kUninitialized),
callback_(NULL),
- output_device_(new FakeOutputDevice) {}
+ output_device_info_(
+ std::string(),
+ OUTPUT_DEVICE_STATUS_OK,
+ media::AudioParameters(media::AudioParameters::AUDIO_FAKE,
+ media::CHANNEL_LAYOUT_STEREO,
+ media::AudioParameters::kTelephoneSampleRate,
+ 16,
+ 1)) {}
FakeAudioRendererSink::~FakeAudioRendererSink() {
DCHECK(!callback_);
@@ -56,8 +61,8 @@ bool FakeAudioRendererSink::SetVolume(double volume) {
return true;
}
-OutputDevice* FakeAudioRendererSink::GetOutputDevice() {
- return output_device_.get();
+OutputDeviceInfo FakeAudioRendererSink::GetOutputDeviceInfo() {
+ return output_device_info_;
}
bool FakeAudioRendererSink::Render(AudioBus* dest,
« no previous file with comments | « media/base/fake_audio_renderer_sink.h ('k') | media/base/fake_output_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698