Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Side by Side Diff: media/midi/midi_port_info.h

Issue 1086073004: Web MIDI: namespace change from media to media::midi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@null
Patch Set: (rebase) Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/midi/midi_message_util_unittest.cc ('k') | media/midi/midi_port_info.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef MEDIA_MIDI_MIDI_PORT_INFO_H_ 5 #ifndef MEDIA_MIDI_MIDI_PORT_INFO_H_
6 #define MEDIA_MIDI_MIDI_PORT_INFO_H_ 6 #define MEDIA_MIDI_MIDI_PORT_INFO_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "media/midi/midi_export.h" 12 #include "media/midi/midi_export.h"
13 13
14 namespace media { 14 namespace media {
15 namespace midi {
15 16
16 enum MidiPortState { 17 enum MidiPortState {
17 MIDI_PORT_DISCONNECTED, 18 MIDI_PORT_DISCONNECTED,
18 MIDI_PORT_CONNECTED, 19 MIDI_PORT_CONNECTED,
19 MIDI_PORT_OPENED, 20 MIDI_PORT_OPENED,
20 MIDI_PORT_STATE_LAST = MIDI_PORT_OPENED, 21 MIDI_PORT_STATE_LAST = MIDI_PORT_OPENED,
21 }; 22 };
22 23
23 struct MIDI_EXPORT MidiPortInfo final { 24 struct MIDI_EXPORT MidiPortInfo final {
24 MidiPortInfo(); 25 MidiPortInfo();
25 MidiPortInfo(const std::string& in_id, 26 MidiPortInfo(const std::string& in_id,
26 const std::string& in_manufacturer, 27 const std::string& in_manufacturer,
27 const std::string& in_name, 28 const std::string& in_name,
28 const std::string& in_version, 29 const std::string& in_version,
29 MidiPortState in_state); 30 MidiPortState in_state);
30 31
31 MidiPortInfo(const MidiPortInfo& info); 32 MidiPortInfo(const MidiPortInfo& info);
32 ~MidiPortInfo(); 33 ~MidiPortInfo();
33 34
34 std::string id; 35 std::string id;
35 std::string manufacturer; 36 std::string manufacturer;
36 std::string name; 37 std::string name;
37 std::string version; 38 std::string version;
38 MidiPortState state; 39 MidiPortState state;
39 }; 40 };
40 41
41 using MidiPortInfoList = std::vector<MidiPortInfo>; 42 using MidiPortInfoList = std::vector<MidiPortInfo>;
42 43
44 } // namespace midi
43 } // namespace media 45 } // namespace media
44 46
45 #endif // MEDIA_MIDI_MIDI_PORT_INFO_H_ 47 #endif // MEDIA_MIDI_MIDI_PORT_INFO_H_
OLDNEW
« no previous file with comments | « media/midi/midi_message_util_unittest.cc ('k') | media/midi/midi_port_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698