From ba64e2bae9b1d00777a81231148e0f69909a840c Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Tue, 14 Jun 2011 18:18:38 +0000 Subject: Improve and unify Mac OS X run-time version checks. Don't use base::SysInfo::OperatingSystemVersionNumbers, because it calls Gestalt, which has a few bad properties. Introduce new functions that perform specific version checks. BUG=85972 TEST=base_unittests MacUtilTest.IsOSEllipsis Review URL: http://codereview.chromium.org/7144007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89028 0039d316-1c4b-4281-b951-d872f2087c98 --- media/audio/mac/audio_manager_mac.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'media/audio/mac/audio_manager_mac.cc') diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index 84d5fee..2679cac 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -4,7 +4,7 @@ #include -#include "base/sys_info.h" +#include "base/mac/mac_util.h" #include "media/audio/fake_audio_input_stream.h" #include "media/audio/fake_audio_output_stream.h" #include "media/audio/mac/audio_input_mac.h" @@ -34,9 +34,7 @@ static size_t GetMaxAudioOutputStreamsAllowed() { // there's no way to detect it within the AudioQueue API, so we put a // special hard limit only for Leopard. // See bug: http://crbug.com/30242 - int32 major, minor, bugfix; - base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix); - if (major < 10 || (major == 10 && minor <= 5)) { + if (base::mac::IsOSLeopardOrEarlier()) { g_max_output_streams = kMaxOutputStreamsLeopard; } else { // In OS other than OSX Leopard, the number of audio streams -- cgit v1.1