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

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: android build fix 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
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/containers/hash_tables.h" 14 #include "base/containers/hash_tables.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "media/base/media_export.h" 17 #include "media/base/media_export.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_input_stream.h" 20 #include "media/midi/usb_midi_input_stream.h"
21 #include "media/midi/usb_midi_jack.h" 21 #include "media/midi/usb_midi_jack.h"
22 #include "media/midi/usb_midi_output_stream.h" 22 #include "media/midi/usb_midi_output_stream.h"
23 23
24 namespace media { 24 namespace media {
25 namespace midi {
25 26
26 class MidiScheduler; 27 class MidiScheduler;
27 28
28 // MidiManager for USB-MIDI. 29 // MidiManager for USB-MIDI.
29 class MEDIA_EXPORT MidiManagerUsb : public MidiManager, 30 class MEDIA_EXPORT MidiManagerUsb : public MidiManager,
30 public UsbMidiDeviceDelegate, 31 public UsbMidiDeviceDelegate,
31 public UsbMidiInputStream::Delegate { 32 public UsbMidiInputStream::Delegate {
32 public: 33 public:
33 explicit MidiManagerUsb(scoped_ptr<UsbMidiDevice::Factory> device_factory); 34 explicit MidiManagerUsb(scoped_ptr<UsbMidiDevice::Factory> device_factory);
34 ~MidiManagerUsb() override; 35 ~MidiManagerUsb() override;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 base::Callback<void(MidiResult result)> initialize_callback_; 82 base::Callback<void(MidiResult result)> initialize_callback_;
82 83
83 // A map from <endpoint_number, cable_number> to the index of input jacks. 84 // A map from <endpoint_number, cable_number> to the index of input jacks.
84 base::hash_map<std::pair<int, int>, size_t> input_jack_dictionary_; 85 base::hash_map<std::pair<int, int>, size_t> input_jack_dictionary_;
85 86
86 scoped_ptr<MidiScheduler> scheduler_; 87 scoped_ptr<MidiScheduler> scheduler_;
87 88
88 DISALLOW_COPY_AND_ASSIGN(MidiManagerUsb); 89 DISALLOW_COPY_AND_ASSIGN(MidiManagerUsb);
89 }; 90 };
90 91
92 } // namespace midi
91 } // namespace media 93 } // namespace media
92 94
93 #endif // MEDIA_MIDI_MIDI_MANAGER_USB_H_ 95 #endif // MEDIA_MIDI_MIDI_MANAGER_USB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698