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

Unified Diff: media/midi/midi_manager_usb.cc

Issue 943333006: MidiManagerUsb should be able to accept multiple devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « no previous file | 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 63c241b9118683e813eb7f089334416c8661f260..cc95254ddf31ca34d742f6b424c0376858242eee 100644
--- a/media/midi/midi_manager_usb.cc
+++ b/media/midi/midi_manager_usb.cc
@@ -83,6 +83,7 @@ void MidiManagerUsb::OnEnumerateDevicesDone(bool result,
return;
}
devices->swap(devices_);
+ std::vector<UsbMidiJack> input_jacks;
for (size_t i = 0; i < devices_.size(); ++i) {
UsbMidiDescriptorParser parser;
std::vector<uint8> descriptor = devices_[i]->GetDescriptor();
@@ -96,7 +97,6 @@ void MidiManagerUsb::OnEnumerateDevicesDone(bool result,
initialize_callback_.Run(MIDI_INITIALIZATION_ERROR);
return;
}
- std::vector<UsbMidiJack> input_jacks;
for (size_t j = 0; j < jacks.size(); ++j) {
if (jacks[j].direction() == UsbMidiJack::DIRECTION_OUT) {
output_streams_.push_back(new UsbMidiOutputStream(jacks[j]));
@@ -121,8 +121,8 @@ void MidiManagerUsb::OnEnumerateDevicesDone(bool result,
AddInputPort(port);
}
}
- input_stream_.reset(new UsbMidiInputStream(input_jacks, this));
}
+ input_stream_.reset(new UsbMidiInputStream(input_jacks, this));
initialize_callback_.Run(MIDI_OK);
}
« no previous file with comments | « no previous file | media/midi/midi_manager_usb_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698