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

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

Issue 1837483003: Move base::FreeDeleter into its own header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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/audio_manager_alsa.h" 5 #include "media/audio/alsa/audio_manager_alsa.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/free_deleter.h"
14 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
15 #include "base/nix/xdg_util.h" 16 #include "base/nix/xdg_util.h"
16 #include "base/process/launch.h" 17 #include "base/process/launch.h"
17 #include "base/stl_util.h" 18 #include "base/stl_util.h"
18 #include "media/audio/audio_output_dispatcher.h" 19 #include "media/audio/audio_output_dispatcher.h"
19 #include "media/audio/audio_parameters.h" 20 #include "media/audio/audio_parameters.h"
20 #if defined(USE_CRAS) 21 #if defined(USE_CRAS)
21 #include "media/audio/cras/audio_manager_cras.h" 22 #include "media/audio/cras/audio_manager_cras.h"
22 #endif 23 #endif
23 #include "media/audio/alsa/alsa_input.h" 24 #include "media/audio/alsa/alsa_input.h"
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 354 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
354 switches::kAlsaInputDevice)) { 355 switches::kAlsaInputDevice)) {
355 device_name = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( 356 device_name = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
356 switches::kAlsaInputDevice); 357 switches::kAlsaInputDevice);
357 } 358 }
358 359
359 return new AlsaPcmInputStream(this, device_name, params, wrapper_.get()); 360 return new AlsaPcmInputStream(this, device_name, params, wrapper_.get());
360 } 361 }
361 362
362 } // namespace media 363 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698