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

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

Issue 9965076: Revert 130180 - Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « media/audio/linux/alsa_input.h ('k') | media/audio/linux/alsa_output.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 #include "media/audio/linux/alsa_input.h" 5 #include "media/audio/linux/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.h" 10 #include "base/message_loop.h"
11 #include "base/time.h" 11 #include "base/time.h"
12 #include "media/audio/audio_manager.h" 12 #include "media/audio/audio_manager.h"
13 #include "media/audio/linux/alsa_output.h" 13 #include "media/audio/linux/alsa_output.h"
14 #include "media/audio/linux/alsa_util.h" 14 #include "media/audio/linux/alsa_util.h"
15 #include "media/audio/linux/alsa_wrapper.h" 15 #include "media/audio/linux/alsa_wrapper.h"
16 #include "media/audio/linux/audio_manager_linux.h" 16 #include "media/audio/linux/audio_manager_linux.h"
17 17
18 namespace media {
19
20 static const int kNumPacketsInRingBuffer = 3; 18 static const int kNumPacketsInRingBuffer = 3;
21 19
22 static const char kDefaultDevice1[] = "default"; 20 static const char kDefaultDevice1[] = "default";
23 static const char kDefaultDevice2[] = "plug:default"; 21 static const char kDefaultDevice2[] = "plug:default";
24 22
25 const char* AlsaPcmInputStream::kAutoSelectDevice = ""; 23 const char* AlsaPcmInputStream::kAutoSelectDevice = "";
26 24
27 AlsaPcmInputStream::AlsaPcmInputStream(AudioManagerLinux* audio_manager, 25 AlsaPcmInputStream::AlsaPcmInputStream(AudioManagerLinux* audio_manager,
28 const std::string& device_name, 26 const std::string& device_name,
29 const AudioParameters& params, 27 const AudioParameters& params,
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 return 0.0; 334 return 0.0;
337 } 335 }
338 336
339 return static_cast<double>(current_volume); 337 return static_cast<double>(current_volume);
340 } 338 }
341 339
342 void AlsaPcmInputStream::HandleError(const char* method, int error) { 340 void AlsaPcmInputStream::HandleError(const char* method, int error) {
343 LOG(WARNING) << method << ": " << wrapper_->StrError(error); 341 LOG(WARNING) << method << ": " << wrapper_->StrError(error);
344 callback_->OnError(this, error); 342 callback_->OnError(this, error);
345 } 343 }
346
347 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/linux/alsa_input.h ('k') | media/audio/linux/alsa_output.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698