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

Side by Side Diff: media/audio/simple_sources.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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/simple_sources.h ('k') | media/audio/simple_sources_unittest.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // MSVC++ requires this to be set before any other includes to get M_PI. 4 // MSVC++ requires this to be set before any other includes to get M_PI.
5 #define _USE_MATH_DEFINES 5 #define _USE_MATH_DEFINES
6 #include <cmath>
7 6
8 #include "media/audio/simple_sources.h" 7 #include "media/audio/simple_sources.h"
9 8
9 #include <stddef.h>
10
10 #include <algorithm> 11 #include <algorithm>
12 #include <cmath>
11 13
12 #include "base/files/file.h" 14 #include "base/files/file.h"
13 #include "base/lazy_instance.h" 15 #include "base/lazy_instance.h"
14 #include "base/logging.h" 16 #include "base/logging.h"
15 #include "media/audio/sounds/wav_audio_handler.h" 17 #include "media/audio/sounds/wav_audio_handler.h"
16 #include "media/base/audio_bus.h" 18 #include "media/base/audio_bus.h"
17 19
18 namespace media { 20 namespace media {
19 namespace { 21 namespace {
20 // Opens |wav_filename|, reads it and loads it as a wav file. This function will 22 // Opens |wav_filename|, reads it and loads it as a wav file. This function will
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 } 298 }
297 299
298 void BeepingSource::OnError(AudioOutputStream* stream) { 300 void BeepingSource::OnError(AudioOutputStream* stream) {
299 } 301 }
300 302
301 void BeepingSource::BeepOnce() { 303 void BeepingSource::BeepOnce() {
302 g_beep_context.Pointer()->SetBeepOnce(true); 304 g_beep_context.Pointer()->SetBeepOnce(true);
303 } 305 }
304 306
305 } // namespace media 307 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/simple_sources.h ('k') | media/audio/simple_sources_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698