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

Unified Diff: media/audio/mac/audio_manager_mac.cc

Issue 10837158: mac: Delete more 10.5-only code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rsesek Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
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 ddddc7ba34f5d92f7122a8d514a43ceaa22d60f5..cb259ff1d2e5261952cee6a5bc517417f0cb6135 100644
--- a/media/audio/mac/audio_manager_mac.cc
+++ b/media/audio/mac/audio_manager_mac.cc
@@ -7,7 +7,6 @@
#include <string>
#include "base/mac/mac_logging.h"
-#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/sys_string_conversions.h"
#include "media/audio/mac/audio_input_mac.h"
@@ -22,10 +21,6 @@ namespace media {
// Maximum number of output streams that can be open simultaneously.
static const int 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.
-static const int kMaxOutputStreamsLeopard = 15;
-
static bool HasAudioHardware(AudioObjectPropertySelector selector) {
AudioDeviceID output_device_id = kAudioObjectUnknown;
const AudioObjectPropertyAddress property_address = {
@@ -212,16 +207,7 @@ static AudioDeviceID GetAudioDeviceIdByUId(bool is_input,
}
AudioManagerMac::AudioManagerMac() {
- // 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
- // 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
- // In OS other than OSX Leopard, the number of audio streams
- // allowed is a lot more.
- int max_output_stream = base::mac::IsOSLeopardOrEarlier() ?
- kMaxOutputStreamsLeopard : kMaxOutputStreams;
- SetMaxOutputStreamsAllowed(max_output_stream);
+ SetMaxOutputStreamsAllowed(kMaxOutputStreams);
}
AudioManagerMac::~AudioManagerMac() {

Powered by Google App Engine
This is Rietveld 408576698