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

Side by Side Diff: media/midi/midi_manager_usb.cc

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_manager_usb.h ('k') | media/midi/midi_manager_usb_unittest.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "media/midi/midi_manager_usb.h" 5 #include "media/midi/midi_manager_usb.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "media/midi/midi_scheduler.h" 12 #include "media/midi/midi_scheduler.h"
13 #include "media/midi/usb_midi_descriptor_parser.h" 13 #include "media/midi/usb_midi_descriptor_parser.h"
14 #include "media/midi/usb_midi_device.h" 14 #include "media/midi/usb_midi_device.h"
15 #include "media/midi/usb_midi_input_stream.h" 15 #include "media/midi/usb_midi_input_stream.h"
16 #include "media/midi/usb_midi_jack.h" 16 #include "media/midi/usb_midi_jack.h"
17 #include "media/midi/usb_midi_output_stream.h" 17 #include "media/midi/usb_midi_output_stream.h"
18 18
19 namespace media { 19 namespace media {
20 namespace midi {
20 21
21 MidiManagerUsb::MidiManagerUsb(scoped_ptr<UsbMidiDevice::Factory> factory) 22 MidiManagerUsb::MidiManagerUsb(scoped_ptr<UsbMidiDevice::Factory> factory)
22 : device_factory_(factory.Pass()) { 23 : device_factory_(factory.Pass()) {
23 } 24 }
24 25
25 MidiManagerUsb::~MidiManagerUsb() { 26 MidiManagerUsb::~MidiManagerUsb() {
26 } 27 }
27 28
28 void MidiManagerUsb::StartInitialization() { 29 void MidiManagerUsb::StartInitialization() {
29 Initialize( 30 Initialize(
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 } else { 152 } else {
152 DCHECK_EQ(jacks[j].direction(), UsbMidiJack::DIRECTION_IN); 153 DCHECK_EQ(jacks[j].direction(), UsbMidiJack::DIRECTION_IN);
153 input_stream_->Add(jacks[j]); 154 input_stream_->Add(jacks[j]);
154 AddInputPort(MidiPortInfo(id, manufacturer, product_name, version, 155 AddInputPort(MidiPortInfo(id, manufacturer, product_name, version,
155 MIDI_PORT_OPENED)); 156 MIDI_PORT_OPENED));
156 } 157 }
157 } 158 }
158 return true; 159 return true;
159 } 160 }
160 161
162 } // namespace midi
161 } // namespace media 163 } // namespace media
OLDNEW
« no previous file with comments | « media/midi/midi_manager_usb.h ('k') | media/midi/midi_manager_usb_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698