| Index: 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 71ce811f204a5aef584a3544616afcf12c1d997d..8b2c9186ef78da56f5a28cca50974492c56003f4 100644
|
| --- a/media/audio/mac/audio_manager_mac.cc
|
| +++ b/media/audio/mac/audio_manager_mac.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -13,23 +13,21 @@
|
| #include "media/audio/mac/audio_output_mac.h"
|
| #include "media/base/limits.h"
|
|
|
| -namespace {
|
| -
|
| -const int kMaxInputChannels = 2;
|
| +static const int kMaxInputChannels = 2;
|
|
|
| // Maximum number of output streams that can be open simultaneously.
|
| -const size_t kMaxOutputStreams = 50;
|
| +static const size_t kMaxOutputStreams = 50;
|
|
|
| // By experiment the maximum number of audio streams allowed in Leopard
|
| // is 18. But we put a slightly smaller number just to be safe.
|
| -const size_t kMaxOutputStreamsLeopard = 15;
|
| +static const size_t kMaxOutputStreamsLeopard = 15;
|
|
|
| // Initialized to ether |kMaxOutputStreams| or |kMaxOutputStreamsLeopard|.
|
| -size_t g_max_output_streams = 0;
|
| +static size_t g_max_output_streams = 0;
|
|
|
| // Returns the number of audio streams allowed. This is a practical limit to
|
| // prevent failure caused by too many audio streams opened.
|
| -size_t GetMaxAudioOutputStreamsAllowed() {
|
| +static size_t GetMaxAudioOutputStreamsAllowed() {
|
| if (g_max_output_streams == 0) {
|
| // We are hitting a bug in Leopard where too many audio streams will cause
|
| // a deadlock in the AudioQueue API when starting the stream. Unfortunately
|
| @@ -50,7 +48,7 @@ size_t GetMaxAudioOutputStreamsAllowed() {
|
| return g_max_output_streams;
|
| }
|
|
|
| -bool HasAudioHardware(AudioObjectPropertySelector selector) {
|
| +static bool HasAudioHardware(AudioObjectPropertySelector selector) {
|
| AudioDeviceID output_device_id = kAudioObjectUnknown;
|
| const AudioObjectPropertyAddress property_address = {
|
| selector,
|
| @@ -67,7 +65,6 @@ bool HasAudioHardware(AudioObjectPropertySelector selector) {
|
| return err == kAudioHardwareNoError &&
|
| output_device_id != kAudioObjectUnknown;
|
| }
|
| -} // namespace
|
|
|
| AudioManagerMac::AudioManagerMac()
|
| : num_output_streams_(0) {
|
|
|