| 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 16 matching lines...) Expand all Loading... |
| 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 "public/platform/modules/webmidi/WebMIDIAccessor.h" | 34 #include "public/platform/modules/webmidi/WebMIDIAccessor.h" |
| 35 #include "public/platform/modules/webmidi/WebMIDIAccessorClient.h" | 35 #include "public/platform/modules/webmidi/WebMIDIAccessorClient.h" |
| 36 #include "wtf/Allocator.h" | 36 #include "wtf/Allocator.h" |
| 37 #include "wtf/OwnPtr.h" | 37 #include <memory> |
| 38 #include "wtf/PassOwnPtr.h" | |
| 39 | 38 |
| 40 namespace blink { | 39 namespace blink { |
| 41 | 40 |
| 42 class MIDIAccessorClient; | 41 class MIDIAccessorClient; |
| 43 | 42 |
| 44 class MIDIAccessor final : public WebMIDIAccessorClient { | 43 class MIDIAccessor final : public WebMIDIAccessorClient { |
| 45 USING_FAST_MALLOC(MIDIAccessor); | 44 USING_FAST_MALLOC(MIDIAccessor); |
| 46 public: | 45 public: |
| 47 static PassOwnPtr<MIDIAccessor> create(MIDIAccessorClient*); | 46 static std::unique_ptr<MIDIAccessor> create(MIDIAccessorClient*); |
| 48 | 47 |
| 49 ~MIDIAccessor() override { } | 48 ~MIDIAccessor() override { } |
| 50 | 49 |
| 51 void startSession(); | 50 void startSession(); |
| 52 void sendMIDIData(unsigned portIndex, const unsigned char* data, size_t leng
th, double timeStamp); | 51 void sendMIDIData(unsigned portIndex, const unsigned char* data, size_t leng
th, double timeStamp); |
| 53 // MIDIAccessInitializer and MIDIAccess are both MIDIAccessClient. | 52 // MIDIAccessInitializer and MIDIAccess are both MIDIAccessClient. |
| 54 // MIDIAccessInitializer is the first client and MIDIAccess takes over it | 53 // MIDIAccessInitializer is the first client and MIDIAccess takes over it |
| 55 // once the initialization successfully finishes. | 54 // once the initialization successfully finishes. |
| 56 void setClient(MIDIAccessorClient* client) { m_client = client; } | 55 void setClient(MIDIAccessorClient* client) { m_client = client; } |
| 57 | 56 |
| 58 // WebMIDIAccessorClient | 57 // WebMIDIAccessorClient |
| 59 void didAddInputPort(const WebString& id, const WebString& manufacturer, con
st WebString& name, const WebString& version, MIDIPortState) override; | 58 void didAddInputPort(const WebString& id, const WebString& manufacturer, con
st WebString& name, const WebString& version, MIDIPortState) override; |
| 60 void didAddOutputPort(const WebString& id, const WebString& manufacturer, co
nst WebString& name, const WebString& version, MIDIPortState) override; | 59 void didAddOutputPort(const WebString& id, const WebString& manufacturer, co
nst WebString& name, const WebString& version, MIDIPortState) override; |
| 61 void didSetInputPortState(unsigned portIndex, MIDIPortState) override; | 60 void didSetInputPortState(unsigned portIndex, MIDIPortState) override; |
| 62 void didSetOutputPortState(unsigned portIndex, MIDIPortState) override; | 61 void didSetOutputPortState(unsigned portIndex, MIDIPortState) override; |
| 63 void didStartSession(bool success, const WebString& error, const WebString&
message) override; | 62 void didStartSession(bool success, const WebString& error, const WebString&
message) override; |
| 64 void didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_
t length, double timeStamp) override; | 63 void didReceiveMIDIData(unsigned portIndex, const unsigned char* data, size_
t length, double timeStamp) override; |
| 65 | 64 |
| 66 private: | 65 private: |
| 67 explicit MIDIAccessor(MIDIAccessorClient*); | 66 explicit MIDIAccessor(MIDIAccessorClient*); |
| 68 | 67 |
| 69 MIDIAccessorClient* m_client; | 68 MIDIAccessorClient* m_client; |
| 70 OwnPtr<WebMIDIAccessor> m_accessor; | 69 std::unique_ptr<WebMIDIAccessor> m_accessor; |
| 71 }; | 70 }; |
| 72 | 71 |
| 73 } // namespace blink | 72 } // namespace blink |
| 74 | 73 |
| 75 #endif // MIDIAccessor_h | 74 #endif // MIDIAccessor_h |
| OLD | NEW |