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

Unified Diff: media/audio/audio_manager_base.h

Issue 1220873010: Revert of Implement HasInputDevices in CrasAudioManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/DEPS ('k') | media/audio/cras/audio_manager_cras.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_manager_base.h
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
index 866ecef5ce68737cebfd28460849aab1c9d357e0..0ac7020435e4d223b646814ad4168bcbba7004eb 100644
--- a/media/audio/audio_manager_base.h
+++ b/media/audio/audio_manager_base.h
@@ -48,38 +48,27 @@
~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);
@@ -103,6 +92,25 @@
// Creates the input stream for the |AUDIO_PCM_LOW_LATENCY| format.
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_; }
« no previous file with comments | « media/DEPS ('k') | media/audio/cras/audio_manager_cras.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698