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

Side by Side Diff: media/audio/mac/audio_manager_mac.h

Issue 13403002: Add OSX aggregate audio device support for best performance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_AUDIO_MAC_AUDIO_MANAGER_MAC_H_ 5 #ifndef MEDIA_AUDIO_MAC_AUDIO_MANAGER_MAC_H_
6 #define MEDIA_AUDIO_MAC_AUDIO_MANAGER_MAC_H_ 6 #define MEDIA_AUDIO_MAC_AUDIO_MANAGER_MAC_H_
7 7
8 #include <CoreAudio/AudioHardware.h> 8 #include <CoreAudio/AudioHardware.h>
9 #include <string> 9 #include <string>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/message_loop_proxy.h" 13 #include "base/message_loop_proxy.h"
14 #include "media/audio/audio_manager_base.h" 14 #include "media/audio/audio_manager_base.h"
15 #include "media/audio/mac/aggregate_device_manager.h"
15 #include "media/audio/mac/audio_device_listener_mac.h" 16 #include "media/audio/mac/audio_device_listener_mac.h"
16 17
17 namespace media { 18 namespace media {
18 19
19 // Mac OS X implementation of the AudioManager singleton. This class is internal 20 // Mac OS X implementation of the AudioManager singleton. This class is internal
20 // to the audio output and only internal users can call methods not exposed by 21 // to the audio output and only internal users can call methods not exposed by
21 // the AudioManager class. 22 // the AudioManager class.
22 class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase { 23 class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase {
23 public: 24 public:
24 AudioManagerMac(); 25 AudioManagerMac();
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 void DestroyDeviceListener(); 69 void DestroyDeviceListener();
69 void HandleDeviceChanges(); 70 void HandleDeviceChanges();
70 71
71 scoped_ptr<AudioDeviceListenerMac> output_device_listener_; 72 scoped_ptr<AudioDeviceListenerMac> output_device_listener_;
72 73
73 // Track the output sample-rate and the default output device 74 // Track the output sample-rate and the default output device
74 // so we can intelligently handle device notifications only when necessary. 75 // so we can intelligently handle device notifications only when necessary.
75 int current_sample_rate_; 76 int current_sample_rate_;
76 AudioDeviceID current_output_device_; 77 AudioDeviceID current_output_device_;
77 78
79 AggregateDeviceManager aggregate_device_manager_;
80
78 DISALLOW_COPY_AND_ASSIGN(AudioManagerMac); 81 DISALLOW_COPY_AND_ASSIGN(AudioManagerMac);
79 }; 82 };
80 83
81 } // namespace media 84 } // namespace media
82 85
83 #endif // MEDIA_AUDIO_MAC_AUDIO_MANAGER_MAC_H_ 86 #endif // MEDIA_AUDIO_MAC_AUDIO_MANAGER_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698