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

content/common/media/audio_messages.h

 // 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.
 
 // IPC messages for the audio.
 // Multiply-included message file, hence no include guard.
 
+#include "base/basictypes.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
 #include "content/common/media/audio_stream_state.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/audio/audio_buffers_state.h"
 #include "media/audio/audio_parameters.h"
 
 #define IPC_MESSAGE_START AudioMsgStart
 
 IPC_ENUM_TRAITS(AudioStreamState)
@@ skipping 78 matching lines @@
 IPC_MESSAGE_CONTROL2(AudioMsg_NotifyStreamVolume,
                      int /* stream id */,
                      double /* volume */)
 
 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyStreamVolume,
                      int /* stream id */,
                      double /* volume */)
 
 IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyDeviceStarted,
                      int /* stream id */,
-                     int /* device_index */)
+                     std::string /* device_id */)
 
 // Messages sent from the renderer to the browser.
 
 // Request that got sent to browser for creating an audio output stream
 IPC_MESSAGE_CONTROL3(AudioHostMsg_CreateStream,
                      int /* stream_id */,
                      AudioParameters /* params */,
                      bool /* low-latency */)
 
 // Request that got sent to browser for creating an audio input stream
-IPC_MESSAGE_CONTROL3(AudioInputHostMsg_CreateStream,
+IPC_MESSAGE_CONTROL4(AudioInputHostMsg_CreateStream,
                      int /* stream_id */,
                      AudioParameters /* params */,
-                     bool /* low-latency */)
+                     bool /* low-latency */,
+                     std::string /* device_id */)
 
 // Tell the browser the audio buffer prepared for stream (stream_id) is
 // filled and is ready to be consumed.
 IPC_MESSAGE_CONTROL2(AudioHostMsg_NotifyPacketReady,
                      int /* stream_id */,
                      uint32 /* packet size */)
 
 // Start buffering and play the audio stream specified by stream_id.
 IPC_MESSAGE_CONTROL1(AudioHostMsg_PlayStream,
                      int /* stream_id */)
@@ skipping 36 matching lines @@
 // Set audio volume of the input stream specified by stream_id.
 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_SetVolume,
                      int /* stream_id */,
                      double /* volume */)
 
 // Start the device referenced by the session_id for the input stream specified
 // by stream_id.
 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_StartDevice,
                      int /* stream_id */,
                      int /* session_id */)