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

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 to parent, match use_alsa logic. 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
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 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 }], 1032 }],
1033 ['media_use_ffmpeg==1', { 1033 ['media_use_ffmpeg==1', {
1034 'dependencies': [ 1034 'dependencies': [
1035 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1035 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1036 ], 1036 ],
1037 }, { # media_use_ffmpeg== 0 1037 }, { # media_use_ffmpeg== 0
1038 'sources!': [ 1038 'sources!': [
1039 'base/media_file_checker_unittest.cc', 1039 'base/media_file_checker_unittest.cc',
1040 ], 1040 ],
1041 }], 1041 }],
1042 ['use_alsa==1', {
1043 'defines': [
1044 'USE_ALSA',
1045 ],
1046 }],
1042 ['use_pulseaudio==1', { 1047 ['use_pulseaudio==1', {
1043 'defines': [ 1048 'defines': [
1044 'USE_PULSEAUDIO', 1049 'USE_PULSEAUDIO',
1045 ], 1050 ],
1046 }], 1051 }],
1047 ['os_posix==1 and OS!="mac" and OS!="ios"', { 1052 ['os_posix==1 and OS!="mac" and OS!="ios"', {
1048 'conditions': [ 1053 'conditions': [
1049 ['linux_use_tcmalloc==1', { 1054 ['linux_use_tcmalloc==1', {
1050 'dependencies': [ 1055 'dependencies': [
1051 '../base/allocator/allocator.gyp:allocator', 1056 '../base/allocator/allocator.gyp:allocator',
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
1587 ], 1592 ],
1588 }], 1593 }],
1589 ], 1594 ],
1590 }], 1595 }],
1591 ], 1596 ],
1592 }, 1597 },
1593 ], 1598 ],
1594 }], 1599 }],
1595 ], 1600 ],
1596 } 1601 }
OLDNEW
« media/audio/audio_manager_unittest.cc ('K') | « 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