Index: media/audio/pulse/pulse_output.cc |
diff --git a/media/audio/pulse/pulse_output.cc b/media/audio/pulse/pulse_output.cc |
index a67ee7f74106572f0bd6eda3ef38d69b299a63b9..19fc47b8be5a154d3235616eb279681719e9f94c 100644 |
--- a/media/audio/pulse/pulse_output.cc |
+++ b/media/audio/pulse/pulse_output.cc |
@@ -49,8 +49,6 @@ PulseAudioOutputStream::PulseAudioOutputStream(const AudioParameters& params, |
pa_stream_(NULL), |
volume_(1.0f), |
source_callback_(NULL) { |
- DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); |
- |
CHECK(params_.IsValid()); |
audio_bus_ = AudioBus::Create(params_); |
} |
@@ -64,7 +62,7 @@ PulseAudioOutputStream::~PulseAudioOutputStream() { |
} |
bool PulseAudioOutputStream::Open() { |
- DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
return pulse::CreateOutputStream(&pa_mainloop_, &pa_context_, &pa_stream_, |
params_, device_id_, &StreamNotifyCallback, |
&StreamRequestCallback, this); |
@@ -109,7 +107,7 @@ void PulseAudioOutputStream::Reset() { |
} |
void PulseAudioOutputStream::Close() { |
- DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
Reset(); |
@@ -159,7 +157,7 @@ void PulseAudioOutputStream::FulfillWriteRequest(size_t requested_bytes) { |
} |
void PulseAudioOutputStream::Start(AudioSourceCallback* callback) { |
- DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
CHECK(callback); |
CHECK(pa_stream_); |
@@ -181,7 +179,7 @@ void PulseAudioOutputStream::Start(AudioSourceCallback* callback) { |
} |
void PulseAudioOutputStream::Stop() { |
- DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
// Cork (pause) the stream. Waiting for the main loop lock will ensure |
// outstanding callbacks have completed. |
@@ -204,13 +202,13 @@ void PulseAudioOutputStream::Stop() { |
} |
void PulseAudioOutputStream::SetVolume(double volume) { |
- DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
volume_ = static_cast<float>(volume); |
} |
void PulseAudioOutputStream::GetVolume(double* volume) { |
- DCHECK(manager_->GetTaskRunner()->BelongsToCurrentThread()); |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
*volume = volume_; |
} |