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

Unified Diff: content/renderer/media/audio_device.cc

Issue 10537121: Adds AudioDevice factory for all audio clients in Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor cleanup Created 8 years, 6 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
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..bb72e78591c31bb47a06694963a43f1f1b65464c 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"
@@ -46,19 +46,22 @@ AudioDevice::AudioDevice()
stream_id_(0),
play_on_start_(true),
is_started_(false) {
- filter_ = RenderThreadImpl::current()->audio_message_filter();
+ DVLOG(1) << "AudioDevice::AudioDevice()";
Chris Rogers 2012/06/25 20:05:17 I'd remove the DVLOG
henrika (OOO until Aug 14) 2012/06/26 11:17:27 Done.
+ // Use the filter instance already created on the main render thread.
+ CHECK(AudioMessageFilter::current()) << "Invalid audio message filter.";
+ filter_ = AudioMessageFilter::current();
}
-AudioDevice::AudioDevice(const media::AudioParameters& params,
- RenderCallback* callback)
+AudioDevice::AudioDevice(AudioMessageFilter* filter)
: ScopedLoopObserver(ChildProcess::current()->io_message_loop()),
- audio_parameters_(params),
- callback_(callback),
+ callback_(NULL),
volume_(1.0),
+ filter_(filter),
stream_id_(0),
play_on_start_(true),
is_started_(false) {
- filter_ = RenderThreadImpl::current()->audio_message_filter();
+ DVLOG(1) << "AudioDevice::AudioDevice(filter)";
Chris Rogers 2012/06/25 20:05:17 I'd remove the DVLOG
henrika (OOO until Aug 14) 2012/06/26 11:17:27 Done.
+ CHECK(filter_) << "Invalid audio message filter.";
}
void AudioDevice::Initialize(const media::AudioParameters& params,
@@ -73,6 +76,7 @@ void AudioDevice::Initialize(const media::AudioParameters& params,
}
AudioDevice::~AudioDevice() {
+ DVLOG(1) << "AudioDevice::~AudioDevice()";
Chris Rogers 2012/06/25 20:05:17 I'd remove the DVLOG
henrika (OOO until Aug 14) 2012/06/26 11:17:27 Done.
// The current design requires that the user calls Stop() before deleting
// this class.
CHECK_EQ(0, stream_id_);

Powered by Google App Engine
This is Rietveld 408576698