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

Side by Side Diff: media/audio/alsa/alsa_input.cc

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | media/audio/alsa/alsa_output.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 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/alsa/alsa_input.h" 5 #include "media/audio/alsa/alsa_input.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/time/time.h"
12 #include "media/audio/alsa/alsa_output.h" 11 #include "media/audio/alsa/alsa_output.h"
13 #include "media/audio/alsa/alsa_util.h" 12 #include "media/audio/alsa/alsa_util.h"
14 #include "media/audio/alsa/alsa_wrapper.h" 13 #include "media/audio/alsa/alsa_wrapper.h"
15 #include "media/audio/alsa/audio_manager_alsa.h" 14 #include "media/audio/alsa/audio_manager_alsa.h"
16 #include "media/audio/audio_manager.h" 15 #include "media/audio/audio_manager.h"
17 16
18 namespace media { 17 namespace media {
19 18
20 static const int kNumPacketsInRingBuffer = 3; 19 static const int kNumPacketsInRingBuffer = 3;
21 20
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 bool AlsaPcmInputStream::IsMuted() { 338 bool AlsaPcmInputStream::IsMuted() {
340 return false; 339 return false;
341 } 340 }
342 341
343 void AlsaPcmInputStream::HandleError(const char* method, int error) { 342 void AlsaPcmInputStream::HandleError(const char* method, int error) {
344 LOG(WARNING) << method << ": " << wrapper_->StrError(error); 343 LOG(WARNING) << method << ": " << wrapper_->StrError(error);
345 callback_->OnError(this); 344 callback_->OnError(this);
346 } 345 }
347 346
348 } // namespace media 347 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | media/audio/alsa/alsa_output.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698