| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // IPC messages for the audio. | 5 // IPC messages for the audio. |
| 6 // Multiply-included message file, hence no include guard. | 6 // Multiply-included message file, hence no include guard. |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 IPC_STRUCT_MEMBER(media::AudioParameters, params) | 42 IPC_STRUCT_MEMBER(media::AudioParameters, params) |
| 43 IPC_STRUCT_MEMBER(bool, automatic_gain_control) | 43 IPC_STRUCT_MEMBER(bool, automatic_gain_control) |
| 44 IPC_STRUCT_MEMBER(uint32_t, shared_memory_count) | 44 IPC_STRUCT_MEMBER(uint32_t, shared_memory_count) |
| 45 IPC_STRUCT_END() | 45 IPC_STRUCT_END() |
| 46 | 46 |
| 47 // Messages sent from the browser to the renderer. | 47 // Messages sent from the browser to the renderer. |
| 48 | 48 |
| 49 // Tell the renderer process that an audio output device has been authorized | 49 // Tell the renderer process that an audio output device has been authorized |
| 50 // for a given stream. The renderer is given the output parameters for the | 50 // for a given stream. The renderer is given the output parameters for the |
| 51 // authorized device. | 51 // authorized device. |
| 52 IPC_MESSAGE_CONTROL3(AudioMsg_NotifyDeviceAuthorized, | 52 IPC_MESSAGE_CONTROL4(AudioMsg_NotifyDeviceAuthorized, |
| 53 int /* stream id */, | 53 int /* stream id */, |
| 54 media::OutputDeviceStatus /* device_status */, | 54 media::OutputDeviceStatus /* device_status */, |
| 55 media::AudioParameters /* output parameters */) | 55 media::AudioParameters /* output parameters */, |
| 56 std::string /* matched_device_id */) |
| 56 | 57 |
| 57 // Tell the renderer process that an audio stream has been created. | 58 // Tell the renderer process that an audio stream has been created. |
| 58 // The renderer process is given a shared memory handle for the audio data | 59 // The renderer process is given a shared memory handle for the audio data |
| 59 // buffer it shares with the browser process. It is also given a SyncSocket that | 60 // buffer it shares with the browser process. It is also given a SyncSocket that |
| 60 // it uses to communicate with the browser process about the state of the | 61 // it uses to communicate with the browser process about the state of the |
| 61 // buffered audio data. | 62 // buffered audio data. |
| 62 IPC_MESSAGE_CONTROL4( | 63 IPC_MESSAGE_CONTROL4( |
| 63 AudioMsg_NotifyStreamCreated, | 64 AudioMsg_NotifyStreamCreated, |
| 64 int /* stream id */, | 65 int /* stream id */, |
| 65 base::SharedMemoryHandle /* handle */, | 66 base::SharedMemoryHandle /* handle */, |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 // Set audio volume of the stream specified by stream_id. | 143 // Set audio volume of the stream specified by stream_id. |
| 143 // TODO(hclam): change this to vector if we have channel numbers other than 2. | 144 // TODO(hclam): change this to vector if we have channel numbers other than 2. |
| 144 IPC_MESSAGE_CONTROL2(AudioHostMsg_SetVolume, | 145 IPC_MESSAGE_CONTROL2(AudioHostMsg_SetVolume, |
| 145 int /* stream_id */, | 146 int /* stream_id */, |
| 146 double /* volume */) | 147 double /* volume */) |
| 147 | 148 |
| 148 // Set audio volume of the input stream specified by stream_id. | 149 // Set audio volume of the input stream specified by stream_id. |
| 149 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_SetVolume, | 150 IPC_MESSAGE_CONTROL2(AudioInputHostMsg_SetVolume, |
| 150 int /* stream_id */, | 151 int /* stream_id */, |
| 151 double /* volume */) | 152 double /* volume */) |
| OLD | NEW |