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

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

Issue 10377175: Merge 136153 - Remove log spam from audio_manager_linux.cc (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1132/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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/audio_manager_linux.h" 5 #include "media/audio/linux/audio_manager_linux.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/nix/xdg_util.h" 10 #include "base/nix/xdg_util.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 << wrapper_->StrError(error); 237 << wrapper_->StrError(error);
238 } 238 }
239 } 239 }
240 240
241 return has_device; 241 return has_device;
242 } 242 }
243 243
244 AudioOutputStream* AudioManagerLinux::MakeLinearOutputStream( 244 AudioOutputStream* AudioManagerLinux::MakeLinearOutputStream(
245 const AudioParameters& params) { 245 const AudioParameters& params) {
246 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 246 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
247 LOG(ERROR) << "MakeLinearOutputStream()";
248 return MakeOutputStream(params); 247 return MakeOutputStream(params);
249 } 248 }
250 249
251 AudioOutputStream* AudioManagerLinux::MakeLowLatencyOutputStream( 250 AudioOutputStream* AudioManagerLinux::MakeLowLatencyOutputStream(
252 const AudioParameters& params) { 251 const AudioParameters& params) {
253 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 252 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
254 LOG(ERROR) << "MakeLowLatencyOutputStream()";
255 return MakeOutputStream(params); 253 return MakeOutputStream(params);
256 } 254 }
257 255
258 AudioInputStream* AudioManagerLinux::MakeLinearInputStream( 256 AudioInputStream* AudioManagerLinux::MakeLinearInputStream(
259 const AudioParameters& params, const std::string& device_id) { 257 const AudioParameters& params, const std::string& device_id) {
260 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 258 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
261 return MakeInputStream(params, device_id); 259 return MakeInputStream(params, device_id);
262 } 260 }
263 261
264 AudioInputStream* AudioManagerLinux::MakeLowLatencyInputStream( 262 AudioInputStream* AudioManagerLinux::MakeLowLatencyInputStream(
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 } 306 }
309 307
310 return new AlsaPcmInputStream(this, device_name, params, wrapper_.get()); 308 return new AlsaPcmInputStream(this, device_name, params, wrapper_.get());
311 } 309 }
312 310
313 AudioManager* CreateAudioManager() { 311 AudioManager* CreateAudioManager() {
314 return new AudioManagerLinux(); 312 return new AudioManagerLinux();
315 } 313 }
316 314
317 } // namespace media 315 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698