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

Unified Diff: media/midi/midi_manager_mac.cc

Issue 2422163002: Web MIDI: use midi_service.mojom for media::midi::PortState (Closed)
Patch Set: gn --check fix Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/midi/midi_manager_android.cc ('k') | media/midi/midi_manager_mac_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/midi/midi_manager_mac.cc
diff --git a/media/midi/midi_manager_mac.cc b/media/midi/midi_manager_mac.cc
index 306b5995253c5f195720fe915c1f399e2d292e22..4e3586376b5a4399a65b6aeab639bed5a9cdd22e 100644
--- a/media/midi/midi_manager_mac.cc
+++ b/media/midi/midi_manager_mac.cc
@@ -18,6 +18,7 @@
using base::IntToString;
using base::SysCFStringRefToUTF8;
using std::string;
+using midi::mojom::PortState;
using midi::mojom::Result;
// NB: System MIDI types are pointer types in 32-bit and integer types in
@@ -87,7 +88,7 @@ MidiPortInfo GetPortInfoFromEndpoint(MIDIEndpointRef endpoint) {
<< result;
}
- const MidiPortState state = MIDI_PORT_OPENED;
+ const PortState state = PortState::OPENED;
return MidiPortInfo(id, manufacturer, name, version, state);
}
@@ -265,7 +266,7 @@ void MidiManagerMac::ReceiveMidiNotify(const MIDINotification* message) {
coremidi_input_, endpoint, reinterpret_cast<void*>(endpoint));
}
} else {
- SetInputPortState(it->second, MIDI_PORT_OPENED);
+ SetInputPortState(it->second, PortState::OPENED);
}
} else if (notification->childType == kMIDIObjectType_Destination) {
// Attaching device is an output device.
@@ -278,7 +279,7 @@ void MidiManagerMac::ReceiveMidiNotify(const MIDINotification* message) {
AddOutputPort(info);
}
} else {
- SetOutputPortState(it - destinations_.begin(), MIDI_PORT_OPENED);
+ SetOutputPortState(it - destinations_.begin(), PortState::OPENED);
}
}
} else if (kMIDIMsgObjectRemoved == message->messageID) {
@@ -291,12 +292,12 @@ void MidiManagerMac::ReceiveMidiNotify(const MIDINotification* message) {
// Detaching device is an input device.
auto it = source_map_.find(endpoint);
if (it != source_map_.end())
- SetInputPortState(it->second, MIDI_PORT_DISCONNECTED);
+ SetInputPortState(it->second, PortState::DISCONNECTED);
} else if (notification->childType == kMIDIObjectType_Destination) {
// Detaching device is an output device.
auto it = std::find(destinations_.begin(), destinations_.end(), endpoint);
if (it != destinations_.end())
- SetOutputPortState(it - destinations_.begin(), MIDI_PORT_DISCONNECTED);
+ SetOutputPortState(it - destinations_.begin(), PortState::DISCONNECTED);
}
}
}
« no previous file with comments | « media/midi/midi_manager_android.cc ('k') | media/midi/midi_manager_mac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698