OLD | NEW |
---|---|
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/audio_input_controller.h" | 5 #include "media/audio/audio_input_controller.h" |
6 | 6 |
7 #include "base/threading/thread_restrictions.h" | 7 #include "base/threading/thread_restrictions.h" |
8 #include "media/base/limits.h" | 8 #include "media/base/limits.h" |
9 | 9 |
10 namespace { | 10 namespace media { |
11 | 11 |
12 const int kMaxInputChannels = 2; | 12 static const int kMaxInputChannels = 2; |
Ami GONE FROM CHROMIUM
2011/03/04 22:52:04
FWIW, for integral constants, using an unnamed enu
scherkus (not reviewing)
2011/03/07 14:57:56
Neat suggestion! I'll keep that around for anothe
| |
13 | |
14 } // namespace | |
15 | |
16 namespace media { | |
17 | 13 |
18 // static | 14 // static |
19 AudioInputController::Factory* AudioInputController::factory_ = NULL; | 15 AudioInputController::Factory* AudioInputController::factory_ = NULL; |
20 | 16 |
21 AudioInputController::AudioInputController(EventHandler* handler) | 17 AudioInputController::AudioInputController(EventHandler* handler) |
22 : handler_(handler), | 18 : handler_(handler), |
23 stream_(NULL), | 19 stream_(NULL), |
24 state_(kEmpty), | 20 state_(kEmpty), |
25 thread_("AudioInputControllerThread") { | 21 thread_("AudioInputControllerThread") { |
26 } | 22 } |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
157 } | 153 } |
158 | 154 |
159 void AudioInputController::OnError(AudioInputStream* stream, int code) { | 155 void AudioInputController::OnError(AudioInputStream* stream, int code) { |
160 // Handle error on the audio controller thread. | 156 // Handle error on the audio controller thread. |
161 thread_.message_loop()->PostTask( | 157 thread_.message_loop()->PostTask( |
162 FROM_HERE, | 158 FROM_HERE, |
163 NewRunnableMethod(this, &AudioInputController::DoReportError, code)); | 159 NewRunnableMethod(this, &AudioInputController::DoReportError, code)); |
164 } | 160 } |
165 | 161 |
166 } // namespace media | 162 } // namespace media |
OLD | NEW |