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

Unified Diff: media/audio/audio_output_dispatcher.h

Issue 163343002: Reland 153623004: Remove the unified IO code on the browser (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed the cras bot Created 6 years, 10 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/audio/audio_output_controller_unittest.cc ('k') | media/audio/audio_output_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_dispatcher.h
diff --git a/media/audio/audio_output_dispatcher.h b/media/audio/audio_output_dispatcher.h
index 69c5f16edfd348e51901046f0b43558cfd36b362..d070b6b243eb3b75ae0d2b0061e6c10f4c2599ff 100644
--- a/media/audio/audio_output_dispatcher.h
+++ b/media/audio/audio_output_dispatcher.h
@@ -38,8 +38,7 @@ class MEDIA_EXPORT AudioOutputDispatcher
public:
AudioOutputDispatcher(AudioManager* audio_manager,
const AudioParameters& params,
- const std::string& output_device_id,
- const std::string& input_device_id);
+ const std::string& device_id);
// Called by AudioOutputProxy to open the stream.
// Returns false, if it fails to open it.
@@ -73,8 +72,7 @@ class MEDIA_EXPORT AudioOutputDispatcher
virtual void CloseStreamsForWedgeFix() = 0;
virtual void RestartStreamsForWedgeFix() = 0;
- // Accessor to the input device id used by unified IO.
- const std::string& input_device_id() const { return input_device_id_; }
+ const std::string& device_id() const { return device_id_; }
protected:
friend class base::RefCountedThreadSafe<AudioOutputDispatcher>;
@@ -85,8 +83,7 @@ class MEDIA_EXPORT AudioOutputDispatcher
AudioManager* audio_manager_;
const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
const AudioParameters params_;
- std::string output_device_id_;
- const std::string input_device_id_;
+ std::string device_id_;
private:
DISALLOW_COPY_AND_ASSIGN(AudioOutputDispatcher);
« no previous file with comments | « media/audio/audio_output_controller_unittest.cc ('k') | media/audio/audio_output_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698