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

Side by Side Diff: media/media.gyp

Issue 23453022: Add AudioManager::GetAudioOutputDeviceNames and implement for pulseaudio. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mediaCleanups
Patch Set: Add missing override. 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/pulse/audio_manager_pulse.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 895 matching lines...) Expand 10 before | Expand all | Expand 10 after
906 '../testing/gmock.gyp:gmock', 906 '../testing/gmock.gyp:gmock',
907 '../testing/gtest.gyp:gtest', 907 '../testing/gtest.gyp:gtest',
908 '../ui/ui.gyp:ui', 908 '../ui/ui.gyp:ui',
909 ], 909 ],
910 'sources': [ 910 'sources': [
911 'audio/audio_input_controller_unittest.cc', 911 'audio/audio_input_controller_unittest.cc',
912 'audio/audio_input_device_unittest.cc', 912 'audio/audio_input_device_unittest.cc',
913 'audio/audio_input_unittest.cc', 913 'audio/audio_input_unittest.cc',
914 'audio/audio_input_volume_unittest.cc', 914 'audio/audio_input_volume_unittest.cc',
915 'audio/audio_low_latency_input_output_unittest.cc', 915 'audio/audio_low_latency_input_output_unittest.cc',
916 'audio/audio_manager_unittest.cc',
916 'audio/audio_output_controller_unittest.cc', 917 'audio/audio_output_controller_unittest.cc',
917 'audio/audio_output_device_unittest.cc', 918 'audio/audio_output_device_unittest.cc',
918 'audio/audio_output_proxy_unittest.cc', 919 'audio/audio_output_proxy_unittest.cc',
919 'audio/audio_parameters_unittest.cc', 920 'audio/audio_parameters_unittest.cc',
920 'audio/audio_power_monitor_unittest.cc', 921 'audio/audio_power_monitor_unittest.cc',
921 'audio/fake_audio_consumer_unittest.cc', 922 'audio/fake_audio_consumer_unittest.cc',
922 'audio/ios/audio_manager_ios_unittest.cc', 923 'audio/ios/audio_manager_ios_unittest.cc',
923 'audio/linux/alsa_output_unittest.cc', 924 'audio/linux/alsa_output_unittest.cc',
924 'audio/mac/audio_auhal_mac_unittest.cc', 925 'audio/mac/audio_auhal_mac_unittest.cc',
925 'audio/mac/audio_device_listener_mac_unittest.cc', 926 'audio/mac/audio_device_listener_mac_unittest.cc',
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 }], 1032 }],
1032 ['media_use_ffmpeg==1', { 1033 ['media_use_ffmpeg==1', {
1033 'dependencies': [ 1034 'dependencies': [
1034 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1035 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1035 ], 1036 ],
1036 }, { # media_use_ffmpeg== 0 1037 }, { # media_use_ffmpeg== 0
1037 'sources!': [ 1038 'sources!': [
1038 'base/media_file_checker_unittest.cc', 1039 'base/media_file_checker_unittest.cc',
1039 ], 1040 ],
1040 }], 1041 }],
1042 ['use_pulseaudio==1', {
1043 'defines': [
1044 'USE_PULSEAUDIO',
1045 ],
1046 }],
1041 ['os_posix==1 and OS!="mac" and OS!="ios"', { 1047 ['os_posix==1 and OS!="mac" and OS!="ios"', {
1042 'conditions': [ 1048 'conditions': [
1043 ['linux_use_tcmalloc==1', { 1049 ['linux_use_tcmalloc==1', {
1044 'dependencies': [ 1050 'dependencies': [
1045 '../base/allocator/allocator.gyp:allocator', 1051 '../base/allocator/allocator.gyp:allocator',
1046 ], 1052 ],
1047 }], 1053 }],
1048 ], 1054 ],
1049 }], 1055 }],
1050 ['OS=="ios"', { 1056 ['OS=="ios"', {
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
1581 ], 1587 ],
1582 }], 1588 }],
1583 ], 1589 ],
1584 }], 1590 }],
1585 ], 1591 ],
1586 }, 1592 },
1587 ], 1593 ],
1588 }], 1594 }],
1589 ], 1595 ],
1590 } 1596 }
OLDNEW
« no previous file with comments | « media/audio/pulse/audio_manager_pulse.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698