| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef MIDIAccessor_h | 31 #ifndef MIDIAccessor_h |
| 32 #define MIDIAccessor_h | 32 #define MIDIAccessor_h |
| 33 | 33 |
| 34 #include "media/midi/midi_service.mojom-blink.h" |
| 34 #include "public/platform/modules/webmidi/WebMIDIAccessor.h" | 35 #include "public/platform/modules/webmidi/WebMIDIAccessor.h" |
| 35 #include "public/platform/modules/webmidi/WebMIDIAccessorClient.h" | 36 #include "public/platform/modules/webmidi/WebMIDIAccessorClient.h" |
| 36 #include "wtf/Allocator.h" | 37 #include "wtf/Allocator.h" |
| 37 #include <memory> | 38 #include <memory> |
| 38 | 39 |
| 39 namespace blink { | 40 namespace blink { |
| 40 | 41 |
| 41 class MIDIAccessorClient; | 42 class MIDIAccessorClient; |
| 42 | 43 |
| 43 class MIDIAccessor final : public WebMIDIAccessorClient { | 44 class MIDIAccessor final : public WebMIDIAccessorClient { |
| (...skipping 12 matching lines...) Expand all Loading... |
| 56 // MIDIAccessInitializer and MIDIAccess are both MIDIAccessClient. | 57 // MIDIAccessInitializer and MIDIAccess are both MIDIAccessClient. |
| 57 // MIDIAccessInitializer is the first client and MIDIAccess takes over it | 58 // MIDIAccessInitializer is the first client and MIDIAccess takes over it |
| 58 // once the initialization successfully finishes. | 59 // once the initialization successfully finishes. |
| 59 void setClient(MIDIAccessorClient* client) { m_client = client; } | 60 void setClient(MIDIAccessorClient* client) { m_client = client; } |
| 60 | 61 |
| 61 // WebMIDIAccessorClient | 62 // WebMIDIAccessorClient |
| 62 void didAddInputPort(const WebString& id, | 63 void didAddInputPort(const WebString& id, |
| 63 const WebString& manufacturer, | 64 const WebString& manufacturer, |
| 64 const WebString& name, | 65 const WebString& name, |
| 65 const WebString& version, | 66 const WebString& version, |
| 66 MIDIPortState) override; | 67 midi::mojom::PortState) override; |
| 67 void didAddOutputPort(const WebString& id, | 68 void didAddOutputPort(const WebString& id, |
| 68 const WebString& manufacturer, | 69 const WebString& manufacturer, |
| 69 const WebString& name, | 70 const WebString& name, |
| 70 const WebString& version, | 71 const WebString& version, |
| 71 MIDIPortState) override; | 72 midi::mojom::PortState) override; |
| 72 void didSetInputPortState(unsigned portIndex, MIDIPortState) override; | 73 void didSetInputPortState(unsigned portIndex, |
| 73 void didSetOutputPortState(unsigned portIndex, MIDIPortState) override; | 74 midi::mojom::PortState) override; |
| 75 void didSetOutputPortState(unsigned portIndex, |
| 76 midi::mojom::PortState) override; |
| 74 void didStartSession(midi::mojom::Result) override; | 77 void didStartSession(midi::mojom::Result) override; |
| 75 void didReceiveMIDIData(unsigned portIndex, | 78 void didReceiveMIDIData(unsigned portIndex, |
| 76 const unsigned char* data, | 79 const unsigned char* data, |
| 77 size_t length, | 80 size_t length, |
| 78 double timeStamp) override; | 81 double timeStamp) override; |
| 79 | 82 |
| 80 private: | 83 private: |
| 81 explicit MIDIAccessor(MIDIAccessorClient*); | 84 explicit MIDIAccessor(MIDIAccessorClient*); |
| 82 | 85 |
| 83 MIDIAccessorClient* m_client; | 86 MIDIAccessorClient* m_client; |
| 84 std::unique_ptr<WebMIDIAccessor> m_accessor; | 87 std::unique_ptr<WebMIDIAccessor> m_accessor; |
| 85 }; | 88 }; |
| 86 | 89 |
| 87 } // namespace blink | 90 } // namespace blink |
| 88 | 91 |
| 89 #endif // MIDIAccessor_h | 92 #endif // MIDIAccessor_h |
| OLD | NEW |