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

Unified Diff: content/renderer/pepper_plugin_delegate_impl.cc

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/media/webrtc_audio_device_impl.cc ('k') | media/audio/audio_input_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper_plugin_delegate_impl.cc
diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc
index 21530563db588a81b6dea5a81c6cb47d88fb0f69..ee5124a0ded071598cd69a495b2e939d287abac9 100644
--- a/content/renderer/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper_plugin_delegate_impl.cc
@@ -46,6 +46,7 @@
#include "content/renderer/render_widget_fullscreen_pepper.h"
#include "content/renderer/webplugin_delegate_proxy.h"
#include "ipc/ipc_channel_handle.h"
+#include "media/audio/audio_manager_base.h"
#include "media/video/capture/video_capture_proxy.h"
#include "ppapi/c/dev/pp_video_dev.h"
#include "ppapi/c/pp_errors.h"
@@ -381,7 +382,7 @@ class PlatformAudioInputImpl
virtual void OnStateChanged(AudioStreamState state) OVERRIDE {}
- virtual void OnDeviceReady(int index) OVERRIDE {}
+ virtual void OnDeviceReady(const std::string&) OVERRIDE {}
// The client to notify when the stream is created. THIS MUST ONLY BE
// ACCESSED ON THE MAIN THREAD.
@@ -451,7 +452,8 @@ void PlatformAudioInputImpl::ShutDown() {
void PlatformAudioInputImpl::InitializeOnIOThread(
const AudioParameters& params) {
stream_id_ = filter_->AddDelegate(this);
- filter_->Send(new AudioInputHostMsg_CreateStream(stream_id_, params, true));
+ filter_->Send(new AudioInputHostMsg_CreateStream(
+ stream_id_, params, true, AudioManagerBase::kDefaultDeviceId));
}
void PlatformAudioInputImpl::StartCaptureOnIOThread() {
« no previous file with comments | « content/renderer/media/webrtc_audio_device_impl.cc ('k') | media/audio/audio_input_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698