diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 21:40:50 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 21:40:50 +0000 |
commit | a0e7e86682f9804b06d59d9163f8118484e30c91 (patch) | |
tree | 2d85734289e5b6dfdf54c24c5de5d8e3f8e0eb39 /media/audio/pulse | |
parent | b2a34d53b43b5c81b36d9c40caeed8353bb3c433 (diff) | |
download | chromium_src-a0e7e86682f9804b06d59d9163f8118484e30c91.zip chromium_src-a0e7e86682f9804b06d59d9163f8118484e30c91.tar.gz chromium_src-a0e7e86682f9804b06d59d9163f8118484e30c91.tar.bz2 |
Replace MessageLoopProxy with SingleThreadTaskRunner for the rest of media/.
BUG=315922
R=dalecurtis@chromium.org
TBR=jam
Review URL: https://codereview.chromium.org/66183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/pulse')
-rw-r--r-- | media/audio/pulse/pulse_output.cc | 16 | ||||
-rw-r--r-- | media/audio/pulse/pulse_unified.cc | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/media/audio/pulse/pulse_output.cc b/media/audio/pulse/pulse_output.cc index c40d4f6..bfa963f 100644 --- a/media/audio/pulse/pulse_output.cc +++ b/media/audio/pulse/pulse_output.cc @@ -6,7 +6,7 @@ #include <pulse/pulseaudio.h> -#include "base/message_loop/message_loop.h" +#include "base/single_thread_task_runner.h" #include "media/audio/audio_manager_base.h" #include "media/audio/audio_parameters.h" #include "media/audio/pulse/pulse_util.h" @@ -47,7 +47,7 @@ PulseAudioOutputStream::PulseAudioOutputStream(const AudioParameters& params, pa_stream_(NULL), volume_(1.0f), source_callback_(NULL) { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); CHECK(params_.IsValid()); audio_bus_ = AudioBus::Create(params_); @@ -62,7 +62,7 @@ PulseAudioOutputStream::~PulseAudioOutputStream() { } bool PulseAudioOutputStream::Open() { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); return pulse::CreateOutputStream(&pa_mainloop_, &pa_context_, &pa_stream_, params_, &StreamNotifyCallback, &StreamRequestCallback, this); @@ -107,7 +107,7 @@ void PulseAudioOutputStream::Reset() { } void PulseAudioOutputStream::Close() { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); Reset(); @@ -157,7 +157,7 @@ void PulseAudioOutputStream::FulfillWriteRequest(size_t requested_bytes) { } void PulseAudioOutputStream::Start(AudioSourceCallback* callback) { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); CHECK(callback); CHECK(pa_stream_); @@ -179,7 +179,7 @@ void PulseAudioOutputStream::Start(AudioSourceCallback* callback) { } void PulseAudioOutputStream::Stop() { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); // Cork (pause) the stream. Waiting for the main loop lock will ensure // outstanding callbacks have completed. @@ -202,13 +202,13 @@ void PulseAudioOutputStream::Stop() { } void PulseAudioOutputStream::SetVolume(double volume) { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); volume_ = static_cast<float>(volume); } void PulseAudioOutputStream::GetVolume(double* volume) { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); *volume = volume_; } diff --git a/media/audio/pulse/pulse_unified.cc b/media/audio/pulse/pulse_unified.cc index c68a797..cd17b01 100644 --- a/media/audio/pulse/pulse_unified.cc +++ b/media/audio/pulse/pulse_unified.cc @@ -4,7 +4,7 @@ #include "media/audio/pulse/pulse_unified.h" -#include "base/message_loop/message_loop.h" +#include "base/single_thread_task_runner.h" #include "base/time/time.h" #include "media/audio/audio_manager_base.h" #include "media/audio/audio_parameters.h" @@ -54,7 +54,7 @@ PulseAudioUnifiedStream::PulseAudioUnifiedStream( output_stream_(NULL), volume_(1.0f), source_callback_(NULL) { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); CHECK(params_.IsValid()); input_bus_ = AudioBus::Create(params_); output_bus_ = AudioBus::Create(params_); @@ -70,7 +70,7 @@ PulseAudioUnifiedStream::~PulseAudioUnifiedStream() { } bool PulseAudioUnifiedStream::Open() { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); // Prepare the recording buffers for the callbacks. fifo_.reset(new media::SeekableBuffer( 0, kFifoSizeInPackets * params_.GetBytesPerBuffer())); @@ -138,7 +138,7 @@ void PulseAudioUnifiedStream::Reset() { } void PulseAudioUnifiedStream::Close() { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); Reset(); // Signal to the manager that we're closed and can be removed. @@ -211,7 +211,7 @@ void PulseAudioUnifiedStream::ReadData() { } void PulseAudioUnifiedStream::Start(AudioSourceCallback* callback) { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); CHECK(callback); CHECK(input_stream_); CHECK(output_stream_); @@ -244,7 +244,7 @@ void PulseAudioUnifiedStream::Start(AudioSourceCallback* callback) { } void PulseAudioUnifiedStream::Stop() { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); // Cork (pause) the stream. Waiting for the main loop lock will ensure // outstanding callbacks have completed. @@ -278,13 +278,13 @@ void PulseAudioUnifiedStream::Stop() { } void PulseAudioUnifiedStream::SetVolume(double volume) { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); volume_ = static_cast<float>(volume); } void PulseAudioUnifiedStream::GetVolume(double* volume) { - DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); + DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); *volume = volume_; } |