diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-25 02:25:08 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-25 02:25:08 +0000 |
| commit | c1fb279fc643f24d300683f39c66efb68e69e2df (patch) | |
| tree | 1750508fa4ae204a055bd11dc8db62d63fd7cfba /media/media.gyp | |
| parent | e35ac56ba6d1be8c6c61f6614e1f6800f64d663c (diff) | |
| download | chromium_src-c1fb279fc643f24d300683f39c66efb68e69e2df.zip chromium_src-c1fb279fc643f24d300683f39c66efb68e69e2df.tar.gz chromium_src-c1fb279fc643f24d300683f39c66efb68e69e2df.tar.bz2 | |
First part of the Mac Audio low level support
- Basic factory support for 16 PCM audio
- Adds PCM audio using Queue Services
- Many functions not implemented, trying to keep CLs to a decent size
- Added two unit tests
Review URL: http://codereview.chromium.org/42494
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index 84451d3..6623568 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -30,6 +30,8 @@ 'sources': [ 'audio/linux/audio_manager_linux.cc', 'audio/mac/audio_manager_mac.cc', + 'audio/mac/audio_output_mac.h', + 'audio/mac/audio_output_mac.cc', 'audio/win/audio_manager_win.h', 'audio/win/audio_output_win.cc', 'audio/win/simple_sources_win.cc', @@ -78,6 +80,16 @@ '..', ], }, + 'conditions': [ + ['OS =="mac"', { + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreAudio.framework', + ], + }, + }], + ], }, { 'target_name': 'media_unittests', @@ -89,6 +101,7 @@ ], 'sources': [ 'audio/win/audio_output_win_unittest.cc', + 'audio/mac/audio_output_mac_unittest.cc', 'base/data_buffer_unittest.cc', 'base/pipeline_impl_unittest.cc', 'base/run_all_unittests.cc', |