diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 16:39:28 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 16:39:28 +0000 |
| commit | 4857a4f0e4ba1bd153cd29a12f86c6c3ec4f9eb8 (patch) | |
| tree | c7b99bdfc145180b1a6e25148df96378b9da3383 /chrome/browser/chromeos/audio_mixer_alsa.h | |
| parent | 6dbdaa892d120c6fbb1355aeb0ba8810dad12840 (diff) | |
| download | chromium_src-4857a4f0e4ba1bd153cd29a12f86c6c3ec4f9eb8.zip chromium_src-4857a4f0e4ba1bd153cd29a12f86c6c3ec4f9eb8.tar.gz chromium_src-4857a4f0e4ba1bd153cd29a12f86c6c3ec4f9eb8.tar.bz2 | |
chromeos: Look for "Master" or "Digital" mixer elements.
This removes the code to control "Headphone" and "Speaker"
elements simultaneously for ARM, and makes us instead just
look for "Master" (x86) or "Digital" (ARM).
BUG=chromium-os:18578
TEST=manual: still works on x86
Review URL: http://codereview.chromium.org/7582024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/audio_mixer_alsa.h')
| -rw-r--r-- | chrome/browser/chromeos/audio_mixer_alsa.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/audio_mixer_alsa.h b/chrome/browser/chromeos/audio_mixer_alsa.h index 579603d..ea7bb6b 100644 --- a/chrome/browser/chromeos/audio_mixer_alsa.h +++ b/chrome/browser/chromeos/audio_mixer_alsa.h @@ -7,7 +7,6 @@ #pragma once #include <string> -#include <vector> #include "base/basictypes.h" #include "base/callback_old.h" @@ -102,9 +101,8 @@ class AudioMixerAlsa : public AudioMixer { // Connection to ALSA. NULL if not connected. _snd_mixer* alsa_mixer_; - // Master mixers (some hardware has e.g. separate headphone and speaker - // elements). - std::vector<_snd_mixer_elem*> master_elements_; + // Master mixer. + _snd_mixer_elem* master_element_; // PCM mixer. May be NULL if the driver doesn't expose one. _snd_mixer_elem* pcm_element_; |