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..7af8d58ab7c5f977b31dfd2969eba7b4310d9440 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" |
scherkus (not reviewing)
2012/06/26 23:34:30
nit: we include this in the .h
henrika (OOO until Aug 14)
2012/06/27 08:23:16
Done.
|
#include "media/audio/audio_output_controller.h" |
#include "media/audio/audio_util.h" |
@@ -46,19 +46,9 @@ AudioDevice::AudioDevice() |
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(); |
+ // Use the filter instance already created on the main render thread. |
+ CHECK(AudioMessageFilter::current()) << "Invalid audio message filter."; |
+ filter_ = AudioMessageFilter::current(); |
} |
void AudioDevice::Initialize(const media::AudioParameters& params, |