diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 04:24:13 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 04:24:13 +0000 |
| commit | edf74b4dad463aec31499fa9b05df616d9bfa787 (patch) | |
| tree | 36b0d984567b4c05b226a9ea0f11c1c4780f77c6 /chrome/chrome_browser.gypi | |
| parent | ba46566966dafa8ea80a56b3a23fa896a82b67f9 (diff) | |
| download | chromium_src-edf74b4dad463aec31499fa9b05df616d9bfa787.zip chromium_src-edf74b4dad463aec31499fa9b05df616d9bfa787.tar.gz chromium_src-edf74b4dad463aec31499fa9b05df616d9bfa787.tar.bz2 | |
ChromeOS mixer: Talk to new ChromeOS audio server.
Instead of talking to ALSA in dB we talk to the new audio
server (CRAS) in percent. CRAS will contain a board-specific
volume curve for mapping percent to dB.
Change written by Dylan Reid <dgreid@chromium.org>.
BUG=chromium-os:25413
TEST=On lumpy: gmerge chromeos-chrome, run chrome and adjust volume.
TBR=dgreid
Review URL: http://codereview.chromium.org/9768007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 33aa725..41a9f21 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -404,6 +404,8 @@ 'browser/chromeos/audio/audio_mixer.h', 'browser/chromeos/audio/audio_mixer_alsa.cc', 'browser/chromeos/audio/audio_mixer_alsa.h', + 'browser/chromeos/audio/audio_mixer_cras.cc', + 'browser/chromeos/audio/audio_mixer_cras.h', 'browser/chromeos/background/desktop_background_observer.cc', 'browser/chromeos/background/desktop_background_observer.h', 'browser/chromeos/bluetooth/bluetooth_adapter.cc', @@ -4137,6 +4139,41 @@ ['exclude', 'browser/ui/toolbar/wrench_menu_model_chromeos.cc'], ], }, { # chromeos==1 + 'variables': { + 'conditions': [ + ['sysroot!=""', { + 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"', + }, { + 'pkg-config': 'pkg-config' + }], + ], + # Override to dynamically link the cras (ChromeOS audio) library. + 'use_cras%': 0, + }, + 'conditions': [ + ['use_cras==1', { + 'cflags': [ + '<!@(<(pkg-config) --cflags libcras)', + ], + 'link_settings': { + 'libraries': [ + '<!@(<(pkg-config) --libs libcras)', + ], + }, + 'defines': [ + 'USE_CRAS', + ], + 'sources/': [ + ['exclude', '^browser/chromeos/audio/audio_mixer_alsa.cc'], + ['exclude', '^browser/chromeos/audio/audio_mixer_alsa.h'], + ], + }, { # use_cras==0 + 'sources/': [ + ['exclude', '^browser/chromeos/audio/audio_mixer_cras.cc'], + ['exclude', '^browser/chromeos/audio/audio_mixer_cras.h'], + ], + }], + ], 'dependencies': [ '../build/linux/system.gyp:dbus-glib', '../third_party/libevent/libevent.gyp:libevent', |