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

Unified Diff: media/audio/clockless_audio_sink.cc

Issue 292363005: Prevent media::ClocklessAudioSink from stopping already stopped threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/clockless_audio_sink.cc
diff --git a/media/audio/clockless_audio_sink.cc b/media/audio/clockless_audio_sink.cc
index ff809d0541dd49fc87f6559bf901563cb5c92cdc..89f43bf42fd4ec06a0598d877912957fe1a0b95f 100644
--- a/media/audio/clockless_audio_sink.cc
+++ b/media/audio/clockless_audio_sink.cc
@@ -73,16 +73,12 @@ void ClocklessAudioSink::Initialize(const AudioParameters& params,
}
void ClocklessAudioSink::Start() {
+ DCHECK(initialized_);
DCHECK(!playing_);
}
void ClocklessAudioSink::Stop() {
- DCHECK(initialized_);
-
- if (!playing_)
- return;
-
- playback_time_ = thread_->Stop();
+ Pause();
}
void ClocklessAudioSink::Play() {
@@ -96,7 +92,13 @@ void ClocklessAudioSink::Play() {
}
void ClocklessAudioSink::Pause() {
- Stop();
+ DCHECK(initialized_);
+
+ if (!playing_)
+ return;
+
+ playing_ = false;
+ playback_time_ = thread_->Stop();
}
bool ClocklessAudioSink::SetVolume(double volume) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698