| Index: media/audio/cras/cras_unified.cc
|
| diff --git a/media/audio/cras/cras_unified.cc b/media/audio/cras/cras_unified.cc
|
| index c85cf59dd5f0ce1774c841fa139e3a21fd0af40b..c41356b4aa775aea2c19c43f8c2a75ae3da2c29b 100644
|
| --- a/media/audio/cras/cras_unified.cc
|
| +++ b/media/audio/cras/cras_unified.cc
|
| @@ -4,11 +4,7 @@
|
|
|
| #include "media/audio/cras/cras_unified.h"
|
|
|
| -#include <cras_client.h>
|
| -
|
| -#include "base/command_line.h"
|
| #include "base/logging.h"
|
| -#include "media/audio/alsa/alsa_util.h"
|
| #include "media/audio/cras/audio_manager_cras.h"
|
|
|
| namespace media {
|
| @@ -116,7 +112,7 @@ bool CrasUnifiedStream::Open() {
|
| return false;
|
| }
|
|
|
| - if (alsa_util::BitsToFormat(params_.bits_per_sample()) ==
|
| + if (AudioManagerCras::BitsToFormat(params_.bits_per_sample()) ==
|
| SND_PCM_FORMAT_UNKNOWN) {
|
| LOG(WARNING) << "Unsupported pcm format";
|
| return false;
|
| @@ -187,7 +183,7 @@ void CrasUnifiedStream::Start(AudioSourceCallback* callback) {
|
| // Prepare |audio_format| and |stream_params| for the stream we
|
| // will create.
|
| cras_audio_format* audio_format = cras_audio_format_create(
|
| - alsa_util::BitsToFormat(params_.bits_per_sample()),
|
| + AudioManagerCras::BitsToFormat(params_.bits_per_sample()),
|
| params_.sample_rate(),
|
| params_.channels());
|
| if (!audio_format) {
|
|
|