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

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

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_unittest.cc ('k') | media/midi/midi_manager_usb.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 #ifndef MEDIA_MIDI_MIDI_MANAGER_USB_H_ 5 #ifndef MEDIA_MIDI_MIDI_MANAGER_USB_H_
6 #define MEDIA_MIDI_MIDI_MANAGER_USB_H_ 6 #define MEDIA_MIDI_MIDI_MANAGER_USB_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/containers/hash_tables.h" 15 #include "base/containers/hash_tables.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "media/midi/midi_manager.h" 18 #include "media/midi/midi_manager.h"
19 #include "media/midi/usb_midi_device.h" 19 #include "media/midi/usb_midi_device.h"
20 #include "media/midi/usb_midi_export.h" 20 #include "media/midi/usb_midi_export.h"
21 #include "media/midi/usb_midi_input_stream.h" 21 #include "media/midi/usb_midi_input_stream.h"
22 #include "media/midi/usb_midi_jack.h" 22 #include "media/midi/usb_midi_jack.h"
23 #include "media/midi/usb_midi_output_stream.h" 23 #include "media/midi/usb_midi_output_stream.h"
24 24
25 namespace media { 25 namespace media {
26 namespace midi {
26 27
27 class MidiScheduler; 28 class MidiScheduler;
28 29
29 // MidiManager for USB-MIDI. 30 // MidiManager for USB-MIDI.
30 class USB_MIDI_EXPORT MidiManagerUsb 31 class USB_MIDI_EXPORT MidiManagerUsb
31 : public MidiManager, 32 : public MidiManager,
32 public UsbMidiDeviceDelegate, 33 public UsbMidiDeviceDelegate,
33 NON_EXPORTED_BASE(public UsbMidiInputStream::Delegate) { 34 NON_EXPORTED_BASE(public UsbMidiInputStream::Delegate) {
34 public: 35 public:
35 explicit MidiManagerUsb(scoped_ptr<UsbMidiDevice::Factory> device_factory); 36 explicit MidiManagerUsb(scoped_ptr<UsbMidiDevice::Factory> device_factory);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 base::Callback<void(MidiResult result)> initialize_callback_; 84 base::Callback<void(MidiResult result)> initialize_callback_;
84 85
85 // A map from <endpoint_number, cable_number> to the index of input jacks. 86 // A map from <endpoint_number, cable_number> to the index of input jacks.
86 base::hash_map<std::pair<int, int>, size_t> input_jack_dictionary_; 87 base::hash_map<std::pair<int, int>, size_t> input_jack_dictionary_;
87 88
88 scoped_ptr<MidiScheduler> scheduler_; 89 scoped_ptr<MidiScheduler> scheduler_;
89 90
90 DISALLOW_COPY_AND_ASSIGN(MidiManagerUsb); 91 DISALLOW_COPY_AND_ASSIGN(MidiManagerUsb);
91 }; 92 };
92 93
94 } // namespace midi
93 } // namespace media 95 } // namespace media
94 96
95 #endif // MEDIA_MIDI_MIDI_MANAGER_USB_H_ 97 #endif // MEDIA_MIDI_MIDI_MANAGER_USB_H_
OLDNEW
« no previous file with comments | « media/midi/midi_manager_unittest.cc ('k') | media/midi/midi_manager_usb.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698