Link things together and enable the device selection for linux and mac.

content/renderer/pepper_plugin_delegate_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <queue>
 
 #include "base/bind.h"
@@ skipping 28 matching lines @@
 #include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "content/renderer/p2p/p2p_transport_impl.h"
 #include "content/renderer/pepper_platform_context_3d_impl.h"
 #include "content/renderer/pepper_platform_video_decoder_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #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"
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/c/private/ppb_flash_net_connector.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserCompletion.h"
@@ skipping 315 matching lines @@
   void ShutDownOnIOThread();
 
   virtual void OnLowLatencyCreated(base::SharedMemoryHandle handle,
                                    base::SyncSocket::Handle socket_handle,
                                    uint32 length) OVERRIDE;
 
   virtual void OnVolume(double volume) OVERRIDE {}
 
   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.
   webkit::ppapi::PluginDelegate::PlatformAudioCommonClient* client_;
 
   // MessageFilter used to send/receive IPC. THIS MUST ONLY BE ACCESSED ON THE
   // I/O thread except to send messages and get the message loop.
   scoped_refptr<AudioInputMessageFilter> filter_;
 
   // Our ID on the MessageFilter. THIS MUST ONLY BE ACCESSED ON THE I/O THREAD
@@ skipping 49 matching lines @@
   // the client on the main thread, and the delegates from the I/O thread.
   client_ = NULL;
   ChildProcess::current()->io_message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&PlatformAudioInputImpl::ShutDownOnIOThread, this));
 }
 
 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() {
   if (stream_id_)
     filter_->Send(new AudioInputHostMsg_RecordStream(stream_id_));
 }
 
 void PlatformAudioInputImpl::StopCaptureOnIOThread() {
   if (stream_id_)
     filter_->Send(new AudioInputHostMsg_CloseStream(stream_id_));
@@ skipping 1472 matching lines @@
   if (!context)
     return NULL;
   if (!context->makeContextCurrent() || context->isContextLost())
     return NULL;
 
   RendererGLContext* parent_context = context->context();
   if (!parent_context)
     return NULL;
   return parent_context;
 }