Index: media/audio/null_audio_sink.cc |
diff --git a/media/audio/null_audio_sink.cc b/media/audio/null_audio_sink.cc |
index c93ceb1efcbad9d434fe9d8ee01649bd94d2497d..a055b1defc94a3d6128b72cea4495b48d7dc60e5 100644 |
--- a/media/audio/null_audio_sink.cc |
+++ b/media/audio/null_audio_sink.cc |
@@ -45,16 +45,16 @@ void NullAudioSink::Start() { |
} |
void NullAudioSink::Stop() { |
- SetPlaying(false); |
+ playing_ = false; |
thread_.Stop(); |
} |
void NullAudioSink::Play() { |
- SetPlaying(true); |
+ playing_ = true; |
} |
void NullAudioSink::Pause(bool /* flush */) { |
- SetPlaying(false); |
+ playing_ = false; |
} |
bool NullAudioSink::SetVolume(double volume) { |
@@ -62,18 +62,11 @@ bool NullAudioSink::SetVolume(double volume) { |
return volume == 0.0; |
} |
-void NullAudioSink::SetPlaying(bool is_playing) { |
- base::AutoLock auto_lock(lock_); |
- playing_ = is_playing; |
-} |
- |
NullAudioSink::~NullAudioSink() { |
DCHECK(!thread_.IsRunning()); |
} |
void NullAudioSink::FillBufferTask() { |
- base::AutoLock auto_lock(lock_); |
- |
base::TimeDelta delay; |
// Only consume buffers when actually playing. |
if (playing_) { |
Ami GONE FROM CHROMIUM
2012/11/01 19:57:01
This variable is set on the pipeline thread but is
DaleCurtis
2012/11/01 22:02:59
Normally we don't want to lock on the audio thread
|