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

Side by Side Diff: media/media.gyp

Issue 23480030: Output device enumeration for Alsa, plus unit test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mediaPulseaudio
Patch Set: Merge LKGR and parent. Created 7 years, 3 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 unified diff | Download patch
« no previous file with comments | « media/audio/linux/audio_manager_linux.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 }], 1035 }],
1036 ['media_use_ffmpeg==1', { 1036 ['media_use_ffmpeg==1', {
1037 'dependencies': [ 1037 'dependencies': [
1038 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1038 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1039 ], 1039 ],
1040 }, { # media_use_ffmpeg== 0 1040 }, { # media_use_ffmpeg== 0
1041 'sources!': [ 1041 'sources!': [
1042 'base/media_file_checker_unittest.cc', 1042 'base/media_file_checker_unittest.cc',
1043 ], 1043 ],
1044 }], 1044 }],
1045 ['use_alsa==1', {
1046 'defines': [
1047 'USE_ALSA',
1048 ],
1049 }],
1045 ['use_pulseaudio==1', { 1050 ['use_pulseaudio==1', {
1046 'defines': [ 1051 'defines': [
1047 'USE_PULSEAUDIO', 1052 'USE_PULSEAUDIO',
1048 ], 1053 ],
1049 }], 1054 }],
1050 ['os_posix==1 and OS!="mac" and OS!="ios"', { 1055 ['os_posix==1 and OS!="mac" and OS!="ios"', {
1051 'conditions': [ 1056 'conditions': [
1052 ['linux_use_tcmalloc==1', { 1057 ['linux_use_tcmalloc==1', {
1053 'dependencies': [ 1058 'dependencies': [
1054 '../base/allocator/allocator.gyp:allocator', 1059 '../base/allocator/allocator.gyp:allocator',
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
1590 ], 1595 ],
1591 }], 1596 }],
1592 ], 1597 ],
1593 }], 1598 }],
1594 ], 1599 ],
1595 }, 1600 },
1596 ], 1601 ],
1597 }], 1602 }],
1598 ], 1603 ],
1599 } 1604 }
OLDNEW
« no previous file with comments | « media/audio/linux/audio_manager_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698