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

Unified Diff: media/midi/midi_manager_usb.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_unittest.cc ('k') | media/midi/midi_manager_usb_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/midi/midi_manager_usb.cc
diff --git a/media/midi/midi_manager_usb.cc b/media/midi/midi_manager_usb.cc
index 35ab6a54701710a4439dd35abff45cc5e622d495..70b2fa9765cd87e77162bc3a597d46890adb22e9 100644
--- a/media/midi/midi_manager_usb.cc
+++ b/media/midi/midi_manager_usb.cc
@@ -14,6 +14,7 @@
namespace midi {
+using mojom::PortState;
using mojom::Result;
MidiManagerUsb::MidiManagerUsb(std::unique_ptr<UsbMidiDevice::Factory> factory)
@@ -95,13 +96,13 @@ void MidiManagerUsb::OnDeviceDetached(size_t index) {
UsbMidiDevice* device = devices_[index];
for (size_t i = 0; i < output_streams_.size(); ++i) {
if (output_streams_[i]->jack().device == device) {
- SetOutputPortState(static_cast<uint32_t>(i), MIDI_PORT_DISCONNECTED);
+ SetOutputPortState(static_cast<uint32_t>(i), PortState::DISCONNECTED);
}
}
const std::vector<UsbMidiJack>& input_jacks = input_stream_->jacks();
for (size_t i = 0; i < input_jacks.size(); ++i) {
if (input_jacks[i].device == device) {
- SetInputPortState(static_cast<uint32_t>(i), MIDI_PORT_DISCONNECTED);
+ SetInputPortState(static_cast<uint32_t>(i), PortState::DISCONNECTED);
}
}
}
@@ -156,12 +157,12 @@ bool MidiManagerUsb::AddPorts(UsbMidiDevice* device, int device_id) {
if (jacks[j].direction() == UsbMidiJack::DIRECTION_OUT) {
output_streams_.push_back(new UsbMidiOutputStream(jacks[j]));
AddOutputPort(MidiPortInfo(id, manufacturer, product_name, version,
- MIDI_PORT_OPENED));
+ PortState::OPENED));
} else {
DCHECK_EQ(jacks[j].direction(), UsbMidiJack::DIRECTION_IN);
input_stream_->Add(jacks[j]);
AddInputPort(MidiPortInfo(id, manufacturer, product_name, version,
- MIDI_PORT_OPENED));
+ PortState::OPENED));
}
}
return true;
« no previous file with comments | « media/midi/midi_manager_unittest.cc ('k') | media/midi/midi_manager_usb_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698