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

Unified Diff: media/midi/midi_manager_usb.cc

Issue 151343002: Web MIDI: make naming convention be consistent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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
Index: media/midi/midi_manager_usb.cc
diff --git a/media/midi/midi_manager_usb.cc b/media/midi/midi_manager_usb.cc
index c240c4aba8d8de42cc52b30048f3efe1f49eaf04..23ad5acc27180df5786d01c73c3b9624dce9706e 100644
--- a/media/midi/midi_manager_usb.cc
+++ b/media/midi/midi_manager_usb.cc
@@ -19,8 +19,8 @@ namespace media {
namespace {
// Noop callback for (sync) Initialize.
-// TODO(yhirano): This function should go away when
-// MIDIManager::Initialize() becomes asynchronous.
+// TODO(crbug.com/339746): This function should go away when
+// MidiManager::Initialize() becomes asynchronous.
void Noop(bool result) {
}
@@ -47,13 +47,13 @@ void MidiManagerUsb::Initialize(base::Callback<void(bool result)> callback) {
base::Unretained(this)));
}
-void MidiManagerUsb::DispatchSendMIDIData(MIDIManagerClient* client,
+void MidiManagerUsb::DispatchSendMidiData(MidiManagerClient* client,
uint32_t port_index,
const std::vector<uint8>& data,
double timestamp) {
DCHECK_LT(port_index, output_streams_.size());
output_streams_[port_index]->Send(data);
- client->AccumulateMIDIBytesSent(data.size());
+ client->AccumulateMidiBytesSent(data.size());
}
void MidiManagerUsb::ReceiveUsbMidiData(UsbMidiDevice* device,
@@ -74,7 +74,7 @@ void MidiManagerUsb::OnReceivedData(size_t jack_index,
const uint8* data,
size_t size,
double timestamp) {
- ReceiveMIDIData(jack_index, data, size, timestamp);
+ ReceiveMidiData(jack_index, data, size, timestamp);
}
@@ -103,12 +103,12 @@ void MidiManagerUsb::OnEnumerateDevicesDone(bool result,
if (jacks[j].direction() == UsbMidiJack::DIRECTION_OUT) {
output_streams_.push_back(new UsbMidiOutputStream(jacks[j]));
// TODO(yhirano): Set appropriate properties.
- AddOutputPort(MIDIPortInfo());
+ AddOutputPort(MidiPortInfo());
} else {
DCHECK_EQ(jacks[j].direction(), UsbMidiJack::DIRECTION_IN);
input_jacks.push_back(jacks[j]);
// TODO(yhirano): Set appropriate properties.
- AddInputPort(MIDIPortInfo());
+ AddInputPort(MidiPortInfo());
}
}
input_stream_.reset(new UsbMidiInputStream(input_jacks, this));

Powered by Google App Engine
This is Rietveld 408576698