| Index: media/audio/cras/cras_input.cc
|
| diff --git a/media/audio/cras/cras_input.cc b/media/audio/cras/cras_input.cc
|
| index e8b08eed9d665eca25b05bde15e3ed7ef960c765..b5ac5012ff3ecb773ad3de60d24f2dd137c44466 100644
|
| --- a/media/audio/cras/cras_input.cc
|
| +++ b/media/audio/cras/cras_input.cc
|
| @@ -11,7 +11,6 @@
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/time/time.h"
|
| #include "media/audio/audio_device_description.h"
|
| -#include "media/audio/audio_manager.h"
|
| #include "media/audio/cras/audio_manager_cras.h"
|
|
|
| namespace media {
|
| @@ -36,7 +35,7 @@ CrasInputStream::CrasInputStream(const AudioParameters& params,
|
| mute_done_(false) {
|
| DCHECK(audio_manager_);
|
| audio_bus_ = AudioBus::Create(params_);
|
| - if (!IsDefault(device_id)) {
|
| + if (!audio_manager_->IsDefault(device_id, true)) {
|
| uint64_t cras_node_id;
|
| base::StringToUint64(device_id, &cras_node_id);
|
| pin_device_ = dev_index_of(cras_node_id);
|
| @@ -355,14 +354,6 @@ bool CrasInputStream::IsMuted() {
|
| return false;
|
| }
|
|
|
| -bool CrasInputStream::IsDefault(const std::string& device_id) const {
|
| - AudioDeviceNames device_names;
|
| - audio_manager_->GetAudioInputDeviceNames(&device_names);
|
| - DCHECK(!device_names.empty());
|
| - AudioDeviceName device_name = device_names.front();
|
| - return device_name.unique_id == device_id;
|
| -}
|
| -
|
| double CrasInputStream::GetVolumeRatioFromDecibels(double dB) const {
|
| return pow(10, dB / 20.0);
|
| }
|
|
|