| Index: media/audio/linux/alsa_util.cc
|
| diff --git a/media/audio/linux/alsa_util.cc b/media/audio/linux/alsa_util.cc
|
| index 27d0fc9499a1ba8acd373add011196ebbe79e173..55aa50e77641e1afd2fe2abdad515e9576998787 100644
|
| --- a/media/audio/linux/alsa_util.cc
|
| +++ b/media/audio/linux/alsa_util.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -9,15 +9,15 @@
|
| #include "base/logging.h"
|
| #include "media/audio/linux/alsa_wrapper.h"
|
|
|
| -namespace {
|
| +namespace alsa_util {
|
|
|
| -snd_pcm_t* OpenDevice(AlsaWrapper* wrapper,
|
| - const char* device_name,
|
| - snd_pcm_stream_t type,
|
| - int channels,
|
| - int sample_rate,
|
| - snd_pcm_format_t pcm_format,
|
| - int latency_us) {
|
| +static snd_pcm_t* OpenDevice(AlsaWrapper* wrapper,
|
| + const char* device_name,
|
| + snd_pcm_stream_t type,
|
| + int channels,
|
| + int sample_rate,
|
| + snd_pcm_format_t pcm_format,
|
| + int latency_us) {
|
| snd_pcm_t* handle = NULL;
|
| int error = wrapper->PcmOpen(&handle, device_name, type, SND_PCM_NONBLOCK);
|
| if (error < 0) {
|
| @@ -43,10 +43,6 @@ snd_pcm_t* OpenDevice(AlsaWrapper* wrapper,
|
| return handle;
|
| }
|
|
|
| -} // namespace
|
| -
|
| -namespace alsa_util {
|
| -
|
| snd_pcm_format_t BitsToFormat(int bits_per_sample) {
|
| switch (bits_per_sample) {
|
| case 8:
|
|
|