diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-15 01:29:07 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-15 01:29:07 +0000 |
| commit | fc58c4d0cbc8e47fa2e138ae3bcd495ebe1027e2 (patch) | |
| tree | c40b5adf009a94544f76c1a97a85b31d7292f53f /media/base | |
| parent | a0c1eac882a4a0888318a9b9487339ca9697a192 (diff) | |
| download | chromium_src-fc58c4d0cbc8e47fa2e138ae3bcd495ebe1027e2.zip chromium_src-fc58c4d0cbc8e47fa2e138ae3bcd495ebe1027e2.tar.gz chromium_src-fc58c4d0cbc8e47fa2e138ae3bcd495ebe1027e2.tar.bz2 | |
Fix typo'd usage of OS_MAC vs OS_MACOSX!
__Now__ renderer side mixing is enabled on Mac :-/
BUG=162768
TEST=audio works, tests pass.
TBR=sky
Review URL: https://codereview.chromium.org/11411189
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/media_switches.cc | 2 | ||||
| -rw-r--r-- | media/base/media_switches.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index 996c749..a7d202d 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -42,7 +42,7 @@ const char kDisableAudioFallback[] = "disable-audio-fallback"; const char kDisableAudioOutputResampler[] = "disable-audio-output-resampler"; // Controls renderer side mixing and low latency audio path for media elements. -#if defined(OS_WIN) || defined(OS_MAC) +#if defined(OS_WIN) || defined(OS_MACOSX) const char kDisableRendererSideMixing[] = "disable-renderer-side-mixing"; #else const char kEnableRendererSideMixing[] = "enable-renderer-side-mixing"; diff --git a/media/base/media_switches.h b/media/base/media_switches.h index 25e87af..c27add3 100644 --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -35,7 +35,7 @@ MEDIA_EXPORT extern const char kDisableAudioFallback[]; MEDIA_EXPORT extern const char kDisableAudioOutputResampler[]; -#if defined(OS_WIN) || defined(OS_MAC) +#if defined(OS_WIN) || defined(OS_MACOSX) MEDIA_EXPORT extern const char kDisableRendererSideMixing[]; #else MEDIA_EXPORT extern const char kEnableRendererSideMixing[]; |