| 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 "ipc/param_traits_macros.h" | 11 #include "ipc/param_traits_macros.h" |
| 12 #include "media/midi/midi_port_info.h" | 12 #include "media/midi/midi_port_info.h" |
| 13 #include "media/midi/midi_result.h" | 13 #include "media/midi/midi_result.h" |
| 14 #include "url/gurl.h" | 14 #include "url/gurl.h" |
| 15 | 15 |
| 16 #undef IPC_MESSAGE_EXPORT | 16 #undef IPC_MESSAGE_EXPORT |
| 17 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 17 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 18 #define IPC_MESSAGE_START MidiMsgStart | 18 #define IPC_MESSAGE_START MidiMsgStart |
| 19 | 19 |
| 20 IPC_ENUM_TRAITS_MAX_VALUE(media::MidiPortState, | 20 IPC_ENUM_TRAITS_MAX_VALUE(media::midi::MidiPortState, |
| 21 media::MIDI_PORT_STATE_LAST) | 21 media::midi::MIDI_PORT_STATE_LAST) |
| 22 | 22 |
| 23 IPC_STRUCT_TRAITS_BEGIN(media::MidiPortInfo) | 23 IPC_STRUCT_TRAITS_BEGIN(media::midi::MidiPortInfo) |
| 24 IPC_STRUCT_TRAITS_MEMBER(id) | 24 IPC_STRUCT_TRAITS_MEMBER(id) |
| 25 IPC_STRUCT_TRAITS_MEMBER(manufacturer) | 25 IPC_STRUCT_TRAITS_MEMBER(manufacturer) |
| 26 IPC_STRUCT_TRAITS_MEMBER(name) | 26 IPC_STRUCT_TRAITS_MEMBER(name) |
| 27 IPC_STRUCT_TRAITS_MEMBER(version) | 27 IPC_STRUCT_TRAITS_MEMBER(version) |
| 28 IPC_STRUCT_TRAITS_MEMBER(state) | 28 IPC_STRUCT_TRAITS_MEMBER(state) |
| 29 IPC_STRUCT_TRAITS_END() | 29 IPC_STRUCT_TRAITS_END() |
| 30 | 30 |
| 31 IPC_ENUM_TRAITS_MAX_VALUE(media::MidiResult, media::MIDI_RESULT_LAST) | 31 IPC_ENUM_TRAITS_MAX_VALUE(media::midi::MidiResult, |
| 32 media::midi::MIDI_RESULT_LAST) |
| 32 | 33 |
| 33 // Messages for IPC between MidiMessageFilter and MidiHost. | 34 // Messages for IPC between MidiMessageFilter and MidiHost. |
| 34 | 35 |
| 35 // Renderer request to browser for access to MIDI services. | 36 // Renderer request to browser for access to MIDI services. |
| 36 IPC_MESSAGE_CONTROL0(MidiHostMsg_StartSession) | 37 IPC_MESSAGE_CONTROL0(MidiHostMsg_StartSession) |
| 37 | 38 |
| 38 IPC_MESSAGE_CONTROL3(MidiHostMsg_SendData, | 39 IPC_MESSAGE_CONTROL3(MidiHostMsg_SendData, |
| 39 uint32 /* port */, | 40 uint32 /* port */, |
| 40 std::vector<uint8> /* data */, | 41 std::vector<uint8> /* data */, |
| 41 double /* timestamp */) | 42 double /* timestamp */) |
| 42 | 43 |
| 43 IPC_MESSAGE_CONTROL0(MidiHostMsg_EndSession) | 44 IPC_MESSAGE_CONTROL0(MidiHostMsg_EndSession) |
| 44 | 45 |
| 45 // Messages sent from the browser to the renderer. | 46 // Messages sent from the browser to the renderer. |
| 46 | 47 |
| 47 IPC_MESSAGE_CONTROL1(MidiMsg_AddInputPort, | 48 IPC_MESSAGE_CONTROL1(MidiMsg_AddInputPort, |
| 48 media::MidiPortInfo /* input port */) | 49 media::midi::MidiPortInfo /* input port */) |
| 49 | 50 |
| 50 IPC_MESSAGE_CONTROL1(MidiMsg_AddOutputPort, | 51 IPC_MESSAGE_CONTROL1(MidiMsg_AddOutputPort, |
| 51 media::MidiPortInfo /* output port */) | 52 media::midi::MidiPortInfo /* output port */) |
| 52 | 53 |
| 53 IPC_MESSAGE_CONTROL2(MidiMsg_SetInputPortState, | 54 IPC_MESSAGE_CONTROL2(MidiMsg_SetInputPortState, |
| 54 uint32 /* port */, | 55 uint32 /* port */, |
| 55 media::MidiPortState /* state */) | 56 media::midi::MidiPortState /* state */) |
| 56 | 57 |
| 57 IPC_MESSAGE_CONTROL2(MidiMsg_SetOutputPortState, | 58 IPC_MESSAGE_CONTROL2(MidiMsg_SetOutputPortState, |
| 58 uint32 /* port */, | 59 uint32 /* port */, |
| 59 media::MidiPortState /* state */) | 60 media::midi::MidiPortState /* state */) |
| 60 | 61 |
| 61 IPC_MESSAGE_CONTROL1(MidiMsg_SessionStarted, | 62 IPC_MESSAGE_CONTROL1(MidiMsg_SessionStarted, |
| 62 media::MidiResult /* result */) | 63 media::midi::MidiResult /* result */) |
| 63 | 64 |
| 64 IPC_MESSAGE_CONTROL3(MidiMsg_DataReceived, | 65 IPC_MESSAGE_CONTROL3(MidiMsg_DataReceived, |
| 65 uint32 /* port */, | 66 uint32 /* port */, |
| 66 std::vector<uint8> /* data */, | 67 std::vector<uint8> /* data */, |
| 67 double /* timestamp */) | 68 double /* timestamp */) |
| 68 | 69 |
| 69 IPC_MESSAGE_CONTROL1(MidiMsg_AcknowledgeSentData, | 70 IPC_MESSAGE_CONTROL1(MidiMsg_AcknowledgeSentData, |
| 70 uint32 /* bytes sent */) | 71 uint32 /* bytes sent */) |
| OLD | NEW |