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

Side by Side Diff: media/audio/cras/audio_manager_cras.cc

Issue 2656523002: Rename media_resources -> localized_strings (Closed)
Patch Set: rebase Created 3 years, 10 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 | « media/audio/audio_device_description.cc ('k') | media/base/BUILD.gn » ('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/cras/audio_manager_cras.h" 5 #include "media/audio/cras/audio_manager_cras.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/environment.h" 12 #include "base/environment.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/metrics/field_trial.h" 14 #include "base/metrics/field_trial.h"
15 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
16 #include "base/nix/xdg_util.h" 16 #include "base/nix/xdg_util.h"
17 #include "base/stl_util.h" 17 #include "base/stl_util.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "chromeos/audio/audio_device.h" 19 #include "chromeos/audio/audio_device.h"
20 #include "chromeos/audio/cras_audio_handler.h" 20 #include "chromeos/audio/cras_audio_handler.h"
21 #include "media/audio/audio_device_description.h" 21 #include "media/audio/audio_device_description.h"
22 #include "media/audio/audio_features.h" 22 #include "media/audio/audio_features.h"
23 #include "media/audio/cras/cras_input.h" 23 #include "media/audio/cras/cras_input.h"
24 #include "media/audio/cras/cras_unified.h" 24 #include "media/audio/cras/cras_unified.h"
25 #include "media/base/channel_layout.h" 25 #include "media/base/channel_layout.h"
26 #include "media/base/media_resources.h" 26 #include "media/base/localized_strings.h"
27 27
28 // cras_util.h headers pull in min/max macros... 28 // cras_util.h headers pull in min/max macros...
29 // TODO(dgreid): Fix headers such that these aren't imported. 29 // TODO(dgreid): Fix headers such that these aren't imported.
30 #undef min 30 #undef min
31 #undef max 31 #undef max
32 32
33 namespace media { 33 namespace media {
34 namespace { 34 namespace {
35 35
36 // Maximum number of output streams that can be open simultaneously. 36 // Maximum number of output streams that can be open simultaneously.
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 case 24: 310 case 24:
311 return SND_PCM_FORMAT_S24; 311 return SND_PCM_FORMAT_S24;
312 case 32: 312 case 32:
313 return SND_PCM_FORMAT_S32; 313 return SND_PCM_FORMAT_S32;
314 default: 314 default:
315 return SND_PCM_FORMAT_UNKNOWN; 315 return SND_PCM_FORMAT_UNKNOWN;
316 } 316 }
317 } 317 }
318 318
319 } // namespace media 319 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/audio_device_description.cc ('k') | media/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698