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

Unified Diff: media/audio/cras/audio_manager_cras.cc

Issue 1892433002: Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_output_device.cc ('k') | media/audio/cras/cras_input.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/cras/audio_manager_cras.cc
diff --git a/media/audio/cras/audio_manager_cras.cc b/media/audio/cras/audio_manager_cras.cc
index 0d70a58d5faf8686179e8b81ed2a15497f6eb664..c18cd67910865fb143cd15283660c3a32ec04623 100644
--- a/media/audio/cras/audio_manager_cras.cc
+++ b/media/audio/cras/audio_manager_cras.cc
@@ -17,6 +17,7 @@
#include "base/stl_util.h"
#include "chromeos/audio/audio_device.h"
#include "chromeos/audio/cras_audio_handler.h"
+#include "media/audio/audio_device_description.h"
#include "media/audio/cras/cras_input.h"
#include "media/audio/cras/cras_unified.h"
#include "media/base/channel_layout.h"
@@ -68,8 +69,7 @@ void AddDefaultDevice(AudioDeviceNames* device_names) {
DCHECK(device_names->empty());
// Cras will route audio from a proper physical device automatically.
- device_names->push_back(AudioDeviceName(AudioManager::GetDefaultDeviceName(),
- AudioManagerBase::kDefaultDeviceId));
+ device_names->push_back(AudioDeviceName::CreateDefault());
}
// Returns a mic positions string if the machine has a beamforming capable
@@ -101,7 +101,7 @@ void AudioManagerCras::AddBeamformingDevices(AudioDeviceNames* device_names) {
if (IsBeamformingDefaultEnabled()) {
// The first device in the list is expected to have a "default" device ID.
// Web apps may depend on this behavior.
- beamforming_on_device_id_ = AudioManagerBase::kDefaultDeviceId;
+ beamforming_on_device_id_ = AudioDeviceDescription::kDefaultDeviceId;
beamforming_off_device_id_ = kBeamformingOffDeviceId;
// Users in the experiment will have the "beamforming on" device appear
@@ -111,7 +111,7 @@ void AudioManagerCras::AddBeamformingDevices(AudioDeviceNames* device_names) {
device_names->push_back(
AudioDeviceName(beamforming_off_name, beamforming_off_device_id_));
} else {
- beamforming_off_device_id_ = AudioManagerBase::kDefaultDeviceId;
+ beamforming_off_device_id_ = AudioDeviceDescription::kDefaultDeviceId;
beamforming_on_device_id_ = kBeamformingOnDeviceId;
device_names->push_back(
« no previous file with comments | « media/audio/audio_output_device.cc ('k') | media/audio/cras/cras_input.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698