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

Side by Side Diff: media/audio/sounds/audio_stream_handler.cc

Issue 2914593002: Replace deprecated base::NonThreadSafe in media/audio in favor of SequenceChecker. (Closed)
Patch Set: Created 3 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 unified diff | Download patch
« no previous file with comments | « media/audio/sounds/audio_stream_handler.h ('k') | media/audio/sounds/sounds_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/audio/sounds/audio_stream_handler.h" 5 #include "media/audio/sounds/audio_stream_handler.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 LOG(ERROR) << "Audio params are invalid."; 190 LOG(ERROR) << "Audio params are invalid.";
191 return; 191 return;
192 } 192 }
193 193
194 // Store the duration of the WAV data then pass the handler to |stream_|. 194 // Store the duration of the WAV data then pass the handler to |stream_|.
195 duration_ = wav_audio->GetDuration(); 195 duration_ = wav_audio->GetDuration();
196 stream_.reset(new AudioStreamContainer(std::move(wav_audio))); 196 stream_.reset(new AudioStreamContainer(std::move(wav_audio)));
197 } 197 }
198 198
199 AudioStreamHandler::~AudioStreamHandler() { 199 AudioStreamHandler::~AudioStreamHandler() {
200 DCHECK(CalledOnValidThread()); 200 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
201 if (IsInitialized()) { 201 if (IsInitialized()) {
202 AudioManager::Get()->GetTaskRunner()->PostTask( 202 AudioManager::Get()->GetTaskRunner()->PostTask(
203 FROM_HERE, base::Bind(&AudioStreamContainer::Stop, 203 FROM_HERE, base::Bind(&AudioStreamContainer::Stop,
204 base::Unretained(stream_.get()))); 204 base::Unretained(stream_.get())));
205 AudioManager::Get()->GetTaskRunner()->DeleteSoon(FROM_HERE, 205 AudioManager::Get()->GetTaskRunner()->DeleteSoon(FROM_HERE,
206 stream_.release()); 206 stream_.release());
207 } 207 }
208 } 208 }
209 209
210 bool AudioStreamHandler::IsInitialized() const { 210 bool AudioStreamHandler::IsInitialized() const {
211 DCHECK(CalledOnValidThread()); 211 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
212 return !!stream_; 212 return !!stream_;
213 } 213 }
214 214
215 bool AudioStreamHandler::Play() { 215 bool AudioStreamHandler::Play() {
216 DCHECK(CalledOnValidThread()); 216 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
217 217
218 if (!IsInitialized()) 218 if (!IsInitialized())
219 return false; 219 return false;
220 220
221 AudioManager::Get()->GetTaskRunner()->PostTask( 221 AudioManager::Get()->GetTaskRunner()->PostTask(
222 FROM_HERE, 222 FROM_HERE,
223 base::Bind(base::IgnoreResult(&AudioStreamContainer::Play), 223 base::Bind(base::IgnoreResult(&AudioStreamContainer::Play),
224 base::Unretained(stream_.get()))); 224 base::Unretained(stream_.get())));
225 return true; 225 return true;
226 } 226 }
227 227
228 void AudioStreamHandler::Stop() { 228 void AudioStreamHandler::Stop() {
229 DCHECK(CalledOnValidThread()); 229 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
230 230
231 if (!IsInitialized()) 231 if (!IsInitialized())
232 return; 232 return;
233 233
234 AudioManager::Get()->GetTaskRunner()->PostTask( 234 AudioManager::Get()->GetTaskRunner()->PostTask(
235 FROM_HERE, 235 FROM_HERE,
236 base::Bind(&AudioStreamContainer::Stop, base::Unretained(stream_.get()))); 236 base::Bind(&AudioStreamContainer::Stop, base::Unretained(stream_.get())));
237 } 237 }
238 238
239 base::TimeDelta AudioStreamHandler::duration() const { 239 base::TimeDelta AudioStreamHandler::duration() const {
240 DCHECK(CalledOnValidThread()); 240 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
241 return duration_; 241 return duration_;
242 } 242 }
243 243
244 // static 244 // static
245 void AudioStreamHandler::SetObserverForTesting(TestObserver* observer) { 245 void AudioStreamHandler::SetObserverForTesting(TestObserver* observer) {
246 g_observer_for_testing = observer; 246 g_observer_for_testing = observer;
247 } 247 }
248 248
249 // static 249 // static
250 void AudioStreamHandler::SetAudioSourceForTesting( 250 void AudioStreamHandler::SetAudioSourceForTesting(
251 AudioOutputStream::AudioSourceCallback* source) { 251 AudioOutputStream::AudioSourceCallback* source) {
252 g_audio_source_for_testing = source; 252 g_audio_source_for_testing = source;
253 } 253 }
254 254
255 } // namespace media 255 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/sounds/audio_stream_handler.h ('k') | media/audio/sounds/sounds_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698