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

Unified Diff: media/audio/audio_input_controller.h

Issue 8491044: Link things together and enable the device selection for linux and mac. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: rebase2 Created 9 years, 1 month 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 | « content/renderer/pepper_plugin_delegate_impl.cc ('k') | media/audio/audio_input_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_input_controller.h
diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h
index 909f3dd5bf3db9d06c3a11dc80ab87102727dc99..387041aca74862a8994dac306d6bc11dcffd080c 100644
--- a/media/audio/audio_input_controller.h
+++ b/media/audio/audio_input_controller.h
@@ -11,7 +11,7 @@
#include "base/threading/thread.h"
#include "base/timer.h"
#include "media/audio/audio_io.h"
-#include "media/audio/audio_manager.h"
+#include "media/audio/audio_manager_base.h"
// An AudioInputController controls an AudioInputStream and records data
// from this input stream. It has an important function that it executes
@@ -93,6 +93,7 @@ class MEDIA_EXPORT AudioInputController
static scoped_refptr<AudioInputController> CreateLowLatency(
EventHandler* event_handler,
const AudioParameters& params,
+ const std::string& device_id,
// External synchronous reader for audio controller.
SyncWriter* sync_writer);
@@ -135,7 +136,7 @@ class MEDIA_EXPORT AudioInputController
AudioInputController(EventHandler* handler, SyncWriter* sync_writer);
// The following methods are executed on the audio controller thread.
- void DoCreate(const AudioParameters& params);
+ void DoCreate(const AudioParameters& params, const std::string& device_id);
void DoRecord();
void DoClose();
void DoReportError(int code);
« no previous file with comments | « content/renderer/pepper_plugin_delegate_impl.cc ('k') | media/audio/audio_input_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698