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

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

Issue 15979015: Reland 15721002: Hook up the device selection to the WebAudio live audio (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed the comments. Created 7 years, 6 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
(...skipping 18 matching lines...) Expand all
29 virtual bool HasAudioInputDevices() OVERRIDE; 29 virtual bool HasAudioInputDevices() OVERRIDE;
30 virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names) 30 virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)
31 OVERRIDE; 31 OVERRIDE;
32 virtual AudioParameters GetInputStreamParameters( 32 virtual AudioParameters GetInputStreamParameters(
33 const std::string& device_id) OVERRIDE; 33 const std::string& device_id) OVERRIDE;
34 34
35 // Implementation of AudioManagerBase. 35 // Implementation of AudioManagerBase.
36 virtual AudioOutputStream* MakeLinearOutputStream( 36 virtual AudioOutputStream* MakeLinearOutputStream(
37 const AudioParameters& params) OVERRIDE; 37 const AudioParameters& params) OVERRIDE;
38 virtual AudioOutputStream* MakeLowLatencyOutputStream( 38 virtual AudioOutputStream* MakeLowLatencyOutputStream(
39 const AudioParameters& params) OVERRIDE; 39 const AudioParameters& params,
40 const std::string& input_device_id) OVERRIDE;
40 virtual AudioInputStream* MakeLinearInputStream( 41 virtual AudioInputStream* MakeLinearInputStream(
41 const AudioParameters& params, const std::string& device_id) OVERRIDE; 42 const AudioParameters& params, const std::string& device_id) OVERRIDE;
42 virtual AudioInputStream* MakeLowLatencyInputStream( 43 virtual AudioInputStream* MakeLowLatencyInputStream(
43 const AudioParameters& params, const std::string& device_id) OVERRIDE; 44 const AudioParameters& params, const std::string& device_id) OVERRIDE;
44 45
45 static bool GetDefaultInputDevice(AudioDeviceID* device); 46 static bool GetDefaultInputDevice(AudioDeviceID* device);
46 static bool GetDefaultOutputDevice(AudioDeviceID* device); 47 static bool GetDefaultOutputDevice(AudioDeviceID* device);
47 static bool GetDefaultDevice(AudioDeviceID* device, bool input); 48 static bool GetDefaultDevice(AudioDeviceID* device, bool input);
48 49
49 static bool GetDefaultOutputChannels(int* channels); 50 static bool GetDefaultOutputChannels(int* channels);
(...skipping 27 matching lines...) Expand all
77 AudioDeviceID current_output_device_; 78 AudioDeviceID current_output_device_;
78 79
79 AggregateDeviceManager aggregate_device_manager_; 80 AggregateDeviceManager aggregate_device_manager_;
80 81
81 DISALLOW_COPY_AND_ASSIGN(AudioManagerMac); 82 DISALLOW_COPY_AND_ASSIGN(AudioManagerMac);
82 }; 83 };
83 84
84 } // namespace media 85 } // namespace media
85 86
86 #endif // MEDIA_AUDIO_MAC_AUDIO_MANAGER_MAC_H_ 87 #endif // MEDIA_AUDIO_MAC_AUDIO_MANAGER_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698