| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 access to MIDI hardware. | 5 // IPC messages for access to MIDI hardware. |
| 6 // Multiply-included message file, hence no include guard. | 6 // Multiply-included message file, hence no include guard. |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "content/common/content_export.h" | 9 #include "content/common/content_export.h" |
| 10 #include "ipc/ipc_message_macros.h" | 10 #include "ipc/ipc_message_macros.h" |
| 11 #include "media/midi/midi_port_info.h" | 11 #include "media/midi/midi_port_info.h" |
| 12 | 12 |
| 13 #undef IPC_MESSAGE_EXPORT | 13 #undef IPC_MESSAGE_EXPORT |
| 14 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 14 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 15 #define IPC_MESSAGE_START MIDIMsgStart | 15 #define IPC_MESSAGE_START MIDIMsgStart |
| 16 | 16 |
| 17 IPC_STRUCT_TRAITS_BEGIN(media::MIDIPortInfo) | 17 IPC_STRUCT_TRAITS_BEGIN(media::MIDIPortInfo) |
| 18 IPC_STRUCT_TRAITS_MEMBER(id) | 18 IPC_STRUCT_TRAITS_MEMBER(id) |
| 19 IPC_STRUCT_TRAITS_MEMBER(manufacturer) | 19 IPC_STRUCT_TRAITS_MEMBER(manufacturer) |
| 20 IPC_STRUCT_TRAITS_MEMBER(name) | 20 IPC_STRUCT_TRAITS_MEMBER(name) |
| 21 IPC_STRUCT_TRAITS_MEMBER(version) | 21 IPC_STRUCT_TRAITS_MEMBER(version) |
| 22 IPC_STRUCT_TRAITS_END() | 22 IPC_STRUCT_TRAITS_END() |
| 23 | 23 |
| 24 // Renderer request to browser for access to MIDI services. | 24 // Renderer request to browser for access to MIDI services. |
| 25 IPC_MESSAGE_CONTROL2(MIDIHostMsg_RequestAccess, | 25 IPC_MESSAGE_CONTROL3(MIDIHostMsg_RequestAccess, |
| 26 std::string /* origin */, |
| 26 int /* client id */, | 27 int /* client id */, |
| 27 int /* access */) | 28 int /* access */) |
| 28 | 29 |
| 29 IPC_MESSAGE_CONTROL3(MIDIHostMsg_SendData, | 30 IPC_MESSAGE_CONTROL3(MIDIHostMsg_SendData, |
| 30 int /* port */, | 31 int /* port */, |
| 31 std::vector<uint8> /* data */, | 32 std::vector<uint8> /* data */, |
| 32 double /* timestamp */) | 33 double /* timestamp */) |
| 33 | 34 |
| 34 // Messages sent from the browser to the renderer. | 35 // Messages sent from the browser to the renderer. |
| 35 | 36 |
| 36 IPC_MESSAGE_CONTROL5(MIDIMsg_AccessApproved, | 37 IPC_MESSAGE_CONTROL5(MIDIMsg_AccessApproved, |
| 37 int /* client id */, | 38 int /* client id */, |
| 38 int /* access */, | 39 int /* access */, |
| 39 bool /* success */, | 40 bool /* success */, |
| 40 media::MIDIPortInfoList /* input ports */, | 41 media::MIDIPortInfoList /* input ports */, |
| 41 media::MIDIPortInfoList /* output ports */) | 42 media::MIDIPortInfoList /* output ports */) |
| 42 | 43 |
| 43 IPC_MESSAGE_CONTROL3(MIDIMsg_DataReceived, | 44 IPC_MESSAGE_CONTROL3(MIDIMsg_DataReceived, |
| 44 int /* port */, | 45 int /* port */, |
| 45 std::vector<uint8> /* data */, | 46 std::vector<uint8> /* data */, |
| 46 double /* timestamp */) | 47 double /* timestamp */) |
| OLD | NEW |