Index: media/audio/audio_manager_base.h |
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h |
index 0ac7020435e4d223b646814ad4168bcbba7004eb..866ecef5ce68737cebfd28460849aab1c9d357e0 100644 |
--- a/media/audio/audio_manager_base.h |
+++ b/media/audio/audio_manager_base.h |
@@ -48,28 +48,39 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { |
~AudioManagerBase() override; |
+ // AudioManager: |
scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override; |
scoped_refptr<base::SingleThreadTaskRunner> GetWorkerTaskRunner() override; |
- |
base::string16 GetAudioInputDeviceModel() override; |
- |
void ShowAudioInputSettings() override; |
- |
void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override; |
- |
void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; |
- |
AudioOutputStream* MakeAudioOutputStream( |
const AudioParameters& params, |
const std::string& device_id) override; |
- |
AudioInputStream* MakeAudioInputStream(const AudioParameters& params, |
const std::string& device_id) override; |
- |
AudioOutputStream* MakeAudioOutputStreamProxy( |
const AudioParameters& params, |
const std::string& device_id) override; |
+ // Listeners will be notified on the GetTaskRunner() task runner. |
+ void AddOutputDeviceChangeListener(AudioDeviceListener* listener) override; |
+ void RemoveOutputDeviceChangeListener(AudioDeviceListener* listener) override; |
+ |
+ AudioParameters GetDefaultOutputStreamParameters() override; |
+ AudioParameters GetOutputStreamParameters( |
+ const std::string& device_id) override; |
+ AudioParameters GetInputStreamParameters( |
+ const std::string& device_id) override; |
+ std::string GetAssociatedOutputDeviceID( |
+ const std::string& input_device_id) override; |
+ scoped_ptr<AudioLog> CreateAudioLog( |
+ AudioLogFactory::AudioComponent component) override; |
+ void SetHasKeyboardMic() override; |
+ |
+ // AudioManagerBase: |
+ |
// Called internally by the audio stream when it has been closed. |
virtual void ReleaseOutputStream(AudioOutputStream* stream); |
virtual void ReleaseInputStream(AudioInputStream* stream); |
@@ -93,25 +104,6 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { |
virtual AudioInputStream* MakeLowLatencyInputStream( |
const AudioParameters& params, const std::string& device_id) = 0; |
- // Listeners will be notified on the GetTaskRunner() task runner. |
- void AddOutputDeviceChangeListener(AudioDeviceListener* listener) override; |
- void RemoveOutputDeviceChangeListener(AudioDeviceListener* listener) override; |
- |
- AudioParameters GetDefaultOutputStreamParameters() override; |
- AudioParameters GetOutputStreamParameters( |
- const std::string& device_id) override; |
- |
- AudioParameters GetInputStreamParameters( |
- const std::string& device_id) override; |
- |
- std::string GetAssociatedOutputDeviceID( |
- const std::string& input_device_id) override; |
- |
- scoped_ptr<AudioLog> CreateAudioLog( |
- AudioLogFactory::AudioComponent component) override; |
- |
- void SetHasKeyboardMic() override; |
- |
// Get number of input or output streams. |
int input_stream_count() const { return num_input_streams_; } |
int output_stream_count() const { return num_output_streams_; } |