| Index: media/midi/usb_midi_descriptor_parser.h
|
| diff --git a/media/midi/usb_midi_descriptor_parser.h b/media/midi/usb_midi_descriptor_parser.h
|
| index 826a449ef6e39cb91cf14a5c8d70b90edef00a42..c043052313b4375d6c7160295d20c776299a2401 100644
|
| --- a/media/midi/usb_midi_descriptor_parser.h
|
| +++ b/media/midi/usb_midi_descriptor_parser.h
|
| @@ -21,6 +21,20 @@ class UsbMidiDevice;
|
| // for collecting USB-MIDI jacks information from the descriptor.
|
| class MEDIA_EXPORT UsbMidiDescriptorParser {
|
| public:
|
| + struct DeviceInfo {
|
| + DeviceInfo()
|
| + : vendor_id(0),
|
| + product_id(0),
|
| + bcd_device_version(0),
|
| + manufacturer_index(0),
|
| + product_index(0) {}
|
| + uint16 vendor_id;
|
| + uint16 product_id;
|
| + uint16 bcd_device_version;
|
| + uint8 manufacturer_index;
|
| + uint8 product_index;
|
| + };
|
| +
|
| UsbMidiDescriptorParser();
|
| ~UsbMidiDescriptorParser();
|
|
|
| @@ -32,11 +46,14 @@ class MEDIA_EXPORT UsbMidiDescriptorParser {
|
| size_t size,
|
| std::vector<UsbMidiJack>* jacks);
|
|
|
| + bool ParseDeviceInfo(const uint8* data, size_t size, DeviceInfo* info);
|
| +
|
| private:
|
| bool ParseInternal(UsbMidiDevice* device,
|
| const uint8* data,
|
| size_t size,
|
| std::vector<UsbMidiJack>* jacks);
|
| + bool ParseDevice(const uint8* data, size_t size, DeviceInfo* info);
|
| bool ParseInterface(const uint8* data, size_t size);
|
| bool ParseCSInterface(UsbMidiDevice* device, const uint8* data, size_t size);
|
| bool ParseEndpoint(const uint8* data, size_t size);
|
|
|