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

Side by Side Diff: media/base/audio_renderer_mixer.h

Issue 1535193003: Add missing macros includes in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/base/audio_renderer.h ('k') | media/base/audio_renderer_mixer_input.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 (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 4
5 #ifndef MEDIA_BASE_AUDIO_RENDERER_MIXER_H_ 5 #ifndef MEDIA_BASE_AUDIO_RENDERER_MIXER_H_
6 #define MEDIA_BASE_AUDIO_RENDERER_MIXER_H_ 6 #define MEDIA_BASE_AUDIO_RENDERER_MIXER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
11 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
12 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
13 #include "base/time/time.h" 14 #include "base/time/time.h"
14 #include "media/base/audio_converter.h" 15 #include "media/base/audio_converter.h"
15 #include "media/base/audio_renderer_sink.h" 16 #include "media/base/audio_renderer_sink.h"
16 #include "media/base/loopback_audio_converter.h" 17 #include "media/base/loopback_audio_converter.h"
17 18
18 namespace media { 19 namespace media {
19 20
20 // Mixes a set of AudioConverter::InputCallbacks into a single output stream 21 // Mixes a set of AudioConverter::InputCallbacks into a single output stream
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 base::TimeDelta pause_delay_; 91 base::TimeDelta pause_delay_;
91 base::TimeTicks last_play_time_; 92 base::TimeTicks last_play_time_;
92 bool playing_; 93 bool playing_;
93 94
94 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixer); 95 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixer);
95 }; 96 };
96 97
97 } // namespace media 98 } // namespace media
98 99
99 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_H_ 100 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_H_
OLDNEW
« no previous file with comments | « media/base/audio_renderer.h ('k') | media/base/audio_renderer_mixer_input.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698