Get ChannelLayout on OSX with non-deprecated methods.

media/audio/mac/audio_output_mac.cc

 // Copyright (c) 2012 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.
 
 #include "media/audio/mac/audio_output_mac.h"
 
 #include <CoreServices/CoreServices.h>
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
@@ skipping 97 matching lines @@
   UInt32 device_id_size = sizeof(device_id);
   OSStatus err = AudioObjectGetPropertyData(kAudioObjectSystemObject,
                                             &property_address, 0, NULL,
                                             &device_id_size, &device_id);
   if (err != noErr) {
     HandleError(err);
     return false;
   }
   // Get the size of the channel layout.
   UInt32 core_layout_size;
-  // TODO(annacc): AudioDeviceGetPropertyInfo() is deprecated, but its
-  // replacement, AudioObjectGetPropertyDataSize(), doesn't work yet with
-  // kAudioDevicePropertyPreferredChannelLayout.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-  err = AudioDeviceGetPropertyInfo(device_id, 0, false,
-                                   kAudioDevicePropertyPreferredChannelLayout,
-                                   &core_layout_size, NULL);
+  property_address.mSelector = kAudioDevicePropertyPreferredChannelLayout;
+  property_address.mScope = kAudioDevicePropertyScopeOutput;
+  err = AudioObjectGetPropertyDataSize(device_id, &property_address, 0, NULL,
+                                       &core_layout_size);
   if (err != noErr) {
     HandleError(err);
     return false;
   }
   // Get the device's channel layout.  This layout may vary in sized based on
   // the number of channels.  Use |core_layout_size| to allocate memory.
   scoped_ptr_malloc<AudioChannelLayout> core_channel_layout;
   core_channel_layout.reset(
       reinterpret_cast<AudioChannelLayout*>(malloc(core_layout_size)));
   memset(core_channel_layout.get(), 0, core_layout_size);
-  // TODO(annacc): AudioDeviceGetProperty() is deprecated, but its
-  // replacement, AudioObjectGetPropertyData(), doesn't work yet with
-  // kAudioDevicePropertyPreferredChannelLayout.
-  err = AudioDeviceGetProperty(device_id, 0, false,
-                               kAudioDevicePropertyPreferredChannelLayout,
-                               &core_layout_size, core_channel_layout.get());
+  err = AudioObjectGetPropertyData(device_id, &property_address, 0, NULL,
+                                   &core_layout_size,
+                                   core_channel_layout.get());
   if (err != noErr) {
     HandleError(err);
     return false;
   }
-#pragma clang diagnostic pop
 
   num_core_channels_ =
       static_cast<int>(core_channel_layout->mNumberChannelDescriptions);
   if (num_core_channels_ == 2 &&
       ChannelLayoutToChannelCount(source_layout_) > 2) {
     should_down_mix_ = true;
     format_.mChannelsPerFrame = num_core_channels_;
     format_.mBytesPerFrame = (format_.mBitsPerChannel >> 3) *
         format_.mChannelsPerFrame;
     format_.mBytesPerPacket = format_.mBytesPerFrame * format_.mFramesPerPacket;
@@ skipping 382 matching lines @@
   source_ = source;
 }
 
 AudioOutputStream::AudioSourceCallback*
 PCMQueueOutAudioOutputStream::GetSource() {
   base::AutoLock lock(source_lock_);
   return source_;
 }
 
 }  // namespace media