diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2023-06-18 22:58:56 +0200 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2023-06-18 22:58:56 +0200 |
commit | a5ae80ac68005dc34f9dcc8030d80035b8053238 (patch) | |
tree | e549e77c573c3d2b54ac276ca1191a35ce484d8b /src/test/controller_mapping_validation_test.h | |
parent | 305322b8e35b5aa2ab686579149a67eb45f57ac7 (diff) | |
parent | e7bb02f7a516804b9a065ca7d4607898fce6a68a (diff) |
Merge remote-tracking branch 'upstream/2.4' into mainmain
Diffstat (limited to 'src/test/controller_mapping_validation_test.h')
-rw-r--r-- | src/test/controller_mapping_validation_test.h | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/src/test/controller_mapping_validation_test.h b/src/test/controller_mapping_validation_test.h index e724d28207..da868da44c 100644 --- a/src/test/controller_mapping_validation_test.h +++ b/src/test/controller_mapping_validation_test.h @@ -8,10 +8,10 @@ #include "controllers/midi/legacymidicontrollermapping.h" #include "test/mixxxtest.h" -class FakeControllerJSProxy : public ControllerJSProxy { +class FakeMidiControllerJSProxy : public ControllerJSProxy { Q_OBJECT public: - FakeControllerJSProxy(); + FakeMidiControllerJSProxy(); Q_INVOKABLE void send(const QList<int>& data, unsigned int length = 0) override; @@ -20,10 +20,36 @@ class FakeControllerJSProxy : public ControllerJSProxy { Q_INVOKABLE void sendShortMsg(unsigned char status, unsigned char byte1, unsigned char byte2); +}; + +class FakeHidControllerJSProxy : public ControllerJSProxy { + Q_OBJECT + public: + FakeHidControllerJSProxy(); + + Q_INVOKABLE void send(const QList<int>& data, unsigned int length = 0) override; + Q_INVOKABLE void send(const QList<int>& dataList, + unsigned int length, + quint8 reportID, + bool useNonSkippingFIFO = false); Q_INVOKABLE void sendOutputReport(quint8 reportID, const QByteArray& dataArray, bool resendUnchangedReport = false); + Q_INVOKABLE QByteArray getInputReport( + quint8 reportID); + Q_INVOKABLE void sendFeatureReport( + quint8 reportID, const QByteArray& reportData); + Q_INVOKABLE QByteArray getFeatureReport( + quint8 reportID); +}; + +class FakeBulkControllerJSProxy : public ControllerJSProxy { + Q_OBJECT + public: + FakeBulkControllerJSProxy(); + + Q_INVOKABLE void send(const QList<int>& data, unsigned int length = 0) override; }; class FakeController : public Controller { @@ -38,7 +64,14 @@ class FakeController : public Controller { } ControllerJSProxy* jsProxy() override { - return new FakeControllerJSProxy(); + if (this->m_bMidiMapping == true) { + return new FakeMidiControllerJSProxy(); + } + if (this->m_bHidMapping == true) { + return new FakeHidControllerJSProxy(); + } + // Bulk mapping + return new FakeBulkControllerJSProxy(); } void setMapping(std::shared_ptr<LegacyControllerMapping> pMapping) override { |