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

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

Issue 23475037: Implement GetAudioOutputDevices for remaining platforms, consolidate tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Merge LKGR, remove anonymous namespaces. Created 7 years, 3 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
« no previous file with comments | « media/audio/linux/audio_manager_linux.cc ('k') | media/audio/mock_audio_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/message_loop_proxy.h" 13 #include "base/message_loop/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/aggregate_device_manager.h"
16 #include "media/audio/mac/audio_device_listener_mac.h" 16 #include "media/audio/mac/audio_device_listener_mac.h"
17 17
18 namespace media { 18 namespace media {
19 19
20 // 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
21 // 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
22 // the AudioManager class. 22 // the AudioManager class.
23 class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase { 23 class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase {
24 public: 24 public:
25 AudioManagerMac(); 25 AudioManagerMac();
26 26
27 // Implementation of AudioManager. 27 // Implementation of AudioManager.
28 virtual bool HasAudioOutputDevices() OVERRIDE; 28 virtual bool HasAudioOutputDevices() OVERRIDE;
29 virtual bool HasAudioInputDevices() OVERRIDE; 29 virtual bool HasAudioInputDevices() OVERRIDE;
30 virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names) 30 virtual void GetAudioInputDeviceNames(
31 OVERRIDE; 31 AudioDeviceNames* device_names) OVERRIDE;
32 virtual void GetAudioOutputDeviceNames(media::AudioDeviceNames* device_names) 32 virtual void GetAudioOutputDeviceNames(
33 OVERRIDE; 33 AudioDeviceNames* device_names) OVERRIDE;
34 virtual AudioParameters GetInputStreamParameters( 34 virtual AudioParameters GetInputStreamParameters(
35 const std::string& device_id) OVERRIDE; 35 const std::string& device_id) OVERRIDE;
36 virtual std::string GetAssociatedOutputDeviceID( 36 virtual std::string GetAssociatedOutputDeviceID(
37 const std::string& input_device_id) OVERRIDE; 37 const std::string& input_device_id) OVERRIDE;
38 38
39 // Implementation of AudioManagerBase. 39 // Implementation of AudioManagerBase.
40 virtual AudioOutputStream* MakeLinearOutputStream( 40 virtual AudioOutputStream* MakeLinearOutputStream(
41 const AudioParameters& params) OVERRIDE; 41 const AudioParameters& params) OVERRIDE;
42 virtual AudioOutputStream* MakeLowLatencyOutputStream( 42 virtual AudioOutputStream* MakeLowLatencyOutputStream(
43 const AudioParameters& params, 43 const AudioParameters& params,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 AudioDeviceID current_output_device_; 88 AudioDeviceID current_output_device_;
89 89
90 AggregateDeviceManager aggregate_device_manager_; 90 AggregateDeviceManager aggregate_device_manager_;
91 91
92 DISALLOW_COPY_AND_ASSIGN(AudioManagerMac); 92 DISALLOW_COPY_AND_ASSIGN(AudioManagerMac);
93 }; 93 };
94 94
95 } // namespace media 95 } // namespace media
96 96
97 #endif // MEDIA_AUDIO_MAC_AUDIO_MANAGER_MAC_H_ 97 #endif // MEDIA_AUDIO_MAC_AUDIO_MANAGER_MAC_H_
OLDNEW
« no previous file with comments | « media/audio/linux/audio_manager_linux.cc ('k') | media/audio/mock_audio_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698