| Index: content/renderer/media/audio_device.cc
|
| diff --git a/content/renderer/media/audio_device.cc b/content/renderer/media/audio_device.cc
|
| index b87f3004166238ead3f3bf155b4588aee3d4438e..f5a0ee311871454679aaccde3abb77be6de7ce20 100644
|
| --- a/content/renderer/media/audio_device.cc
|
| +++ b/content/renderer/media/audio_device.cc
|
| @@ -11,7 +11,7 @@
|
| #include "content/common/child_process.h"
|
| #include "content/common/media/audio_messages.h"
|
| #include "content/common/view_messages.h"
|
| -#include "content/renderer/render_thread_impl.h"
|
| +#include "content/renderer/media/audio_message_filter.h"
|
| #include "media/audio/audio_output_controller.h"
|
| #include "media/audio/audio_util.h"
|
|
|
| @@ -39,26 +39,15 @@ class AudioDevice::AudioThreadCallback
|
| DISALLOW_COPY_AND_ASSIGN(AudioThreadCallback);
|
| };
|
|
|
| -AudioDevice::AudioDevice()
|
| +AudioDevice::AudioDevice(AudioMessageFilter* filter)
|
| : ScopedLoopObserver(ChildProcess::current()->io_message_loop()),
|
| callback_(NULL),
|
| volume_(1.0),
|
| + filter_(filter),
|
| stream_id_(0),
|
| play_on_start_(true),
|
| is_started_(false) {
|
| - filter_ = RenderThreadImpl::current()->audio_message_filter();
|
| -}
|
| -
|
| -AudioDevice::AudioDevice(const media::AudioParameters& params,
|
| - RenderCallback* callback)
|
| - : ScopedLoopObserver(ChildProcess::current()->io_message_loop()),
|
| - audio_parameters_(params),
|
| - callback_(callback),
|
| - volume_(1.0),
|
| - stream_id_(0),
|
| - play_on_start_(true),
|
| - is_started_(false) {
|
| - filter_ = RenderThreadImpl::current()->audio_message_filter();
|
| + CHECK(filter_) << "Invalid audio message filter.";
|
| }
|
|
|
| void AudioDevice::Initialize(const media::AudioParameters& params,
|
| @@ -73,6 +62,7 @@ void AudioDevice::Initialize(const media::AudioParameters& params,
|
| }
|
|
|
| AudioDevice::~AudioDevice() {
|
| + DVLOG(1) << "AudioDevice::~AudioDevice()";
|
| // The current design requires that the user calls Stop() before deleting
|
| // this class.
|
| CHECK_EQ(0, stream_id_);
|
|
|