Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ControllerEngine Refactoring #3463

Merged
merged 79 commits into from
Dec 20, 2020
Merged

ControllerEngine Refactoring #3463

merged 79 commits into from
Dec 20, 2020

Commits on Jul 12, 2020

  1. split ControllerEngine functionality into ControllerEngineJSProxy

    @Be-ing
    Be-ing committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    fed2e1b View commit details
    Browse the repository at this point in the history

  2. reorganize controller scripting code 

    * Move src/controllers/engine to src/controllers/scripting
* Create src/controllers/scripting/legacy subfolder
* Rename ControllerEngine to ControllerScriptHandler
* Rename ControllerEngineJSProxy to ControllerScriptInterface
    @Be-ing
    Be-ing committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    9c04291 View commit details
    Browse the repository at this point in the history

  3. controllers: clean up some #includes

    @Be-ing
    Be-ing committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    24408ab View commit details
    Browse the repository at this point in the history

  4. split ControllerScriptHandler into base and subclasses 

    This allows for a clean separation between new and legacy code.
    @Be-ing
    Be-ing committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    979a243 View commit details
    Browse the repository at this point in the history

  5. remove hacks for JS modules in legacy controller system

    @Be-ing
    Be-ing committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    b3d6ff8 View commit details
    Browse the repository at this point in the history

  6. ControllerScriptEngineBase: remove outdated comment

    @Be-ing
    Be-ing committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    72e849f View commit details
    Browse the repository at this point in the history

  7. Controller: replace legacy NULL with nullptr

    @Be-ing
    Be-ing committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    0968a9d View commit details
    Browse the repository at this point in the history

  8. ControllerScriptModuleEngine: keep build working with Qt < 5.12

    @Be-ing
    Be-ing committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    77ca43f View commit details
    Browse the repository at this point in the history

  9. cleanup handling of incoming HID/USB Bulk/MIDI sysex data

    @Be-ing
    Be-ing committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    8153b3f View commit details
    Browse the repository at this point in the history

  10. MidiController: rename confusingly overloaded "receive" method

    @Be-ing
    Be-ing committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    9363b49 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. ControllerScriptEngine: generate wrappers for input callbacks 

    This avoids calling two separate JS functions (one to convert the
ArrayBuffer to a Uint8Array then the callback) every time controller
input is received.
    @Be-ing
    Be-ing committed Jul 13, 2020
    6 Configuration menu
    Copy the full SHA
    e25bf12 View commit details
    Browse the repository at this point in the history

  2. HIDController: avoid deep copying input data

    @Be-ing
    Be-ing committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    e8e2487 View commit details
    Browse the repository at this point in the history

  3. Controller: pass received input QByteArray by reference

    @Be-ing
    Be-ing committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    26b51ec View commit details
    Browse the repository at this point in the history

  4. BulkController: avoid deep copying input data

    @Be-ing
    Be-ing committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    e99cef3 View commit details
    Browse the repository at this point in the history

  5. ControllerScriptModuleEngine: pass raw ArrayBuffer to input callback 

    ArrayBuffer is more useful for HID and perhaps other use cases. For
backwards compatibility, continue to convert the ArrayBuffer to a
Uint8Array in ControllerScriptEngineLegacy

following discussion on
https://github.com/mixxxdj/mixxx/pull/2920/files/9363b497e13e39191655441a32b458f0af1727d8..e25bf12ab4bd910745d4359a9b3520b8c7f673c9#diff-69d807d0e5894e9f5bf1bd447ca878ab
    @Be-ing
    Be-ing committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    f6f7050 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2020

  1. Hss1394Controller: fix build

    @Be-ing
    Be-ing committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    b4d2d21 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. Merge remote-tracking branch 'upstream/master' into controllerengine_… 

    …refactoring
    @Be-ing
    Be-ing committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    197c0d0 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2020

  1. Merge remote-tracking branch 'upstream/master' into controllerengine_… 

    …refactoring
    @Be-ing
    Be-ing committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    62fc40c View commit details
    Browse the repository at this point in the history

  2. change explicit comparisons to nullptr to implicit

    @Be-ing
    Be-ing committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    2046add View commit details
    Browse the repository at this point in the history

  3. HSS1394Controller: replace C cast with reinterpret_cast

    @Be-ing
    Be-ing committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    a691d32 View commit details
    Browse the repository at this point in the history

  4. ControllerScriptEngineLegacy: make iterator const

    @Be-ing
    Be-ing committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    487f8f9 View commit details
    Browse the repository at this point in the history

  5. rename ControllerScriptInterface to ControllerScriptInterfaceLegacy

    @Be-ing
    Be-ing committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    2b6eb9f View commit details
    Browse the repository at this point in the history

  6. ControllerScriptInterfaceLegacy: clang-format fixes

    @Be-ing
    Be-ing committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    fa16b57 View commit details
    Browse the repository at this point in the history

  7. assert for missing ControlObjects with --controllerDebug CLI option

    @Be-ing
    Be-ing committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    427ba5e View commit details
    Browse the repository at this point in the history

  8. remove legacy ControllerEngine file brought back from merge

    @Be-ing
    Be-ing committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    caf3d68 View commit details
    Browse the repository at this point in the history

  9. ControllerScriptEngineLegacy: remove QString initialization to ""

    @Be-ing
    Be-ing committed Sep 1, 2020
    Configuration menu
    Copy the full SHA
    6c1a6b6 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2020

  1. ControllerScriptEngineBase: fix typo in comment 

    Thanks codespell!
    @Be-ing
    Be-ing committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    df4f377 View commit details
    Browse the repository at this point in the history

  2. fix ControllerEngine tests

    @Be-ing
    Be-ing committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    8ec7ed8 View commit details
    Browse the repository at this point in the history

  3. rename ControllerEngineTest to ControllerScriptEngineLegacyTest

    @Be-ing
    Be-ing committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    0d39501 View commit details
    Browse the repository at this point in the history

  4. ControllerScriptEngineLegacyTest clang-format fixes

    @Be-ing
    Be-ing committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    13f86a5 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2020

  1. Merge remote-tracking branch 'upstream/master' into controllerengine_… 

    …refactoring
    @Be-ing
    Be-ing committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    e028e3e View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2020

  1. Merge remote-tracking branch 'upstream/main' into controllerengine_re… 

    …factoring
    @Be-ing
    Be-ing committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    5c1ace9 View commit details
    Browse the repository at this point in the history

  2. ControllerScriptEngineBase: make m_scriptWatcher private

    @Be-ing
    Be-ing committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    bdf497b View commit details
    Browse the repository at this point in the history

  3. ControllerScriptEngineBase: don't call virtual destructor

    @Be-ing
    Be-ing committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    3383aef View commit details
    Browse the repository at this point in the history

  4. ControllerScriptEngineBase: fix removing files from watcher

    @Be-ing
    Be-ing committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    19b9aaf View commit details
    Browse the repository at this point in the history

  5. ControllerScriptEngineBase: pass QFileInfo& to watchScriptFile

    @Be-ing
    Be-ing committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    4505c86 View commit details
    Browse the repository at this point in the history

  6. make ControllerScriptEngine classes' constructors explicit

    @Be-ing
    Be-ing committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    95b83ea View commit details
    Browse the repository at this point in the history

  7. mark child classes' destructors override

    @Be-ing
    Be-ing committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    e4bdfdd View commit details
    Browse the repository at this point in the history

  8. ControllerScriptEngineBase: log error when unable to watch file

    @Be-ing
    Be-ing committed Oct 24, 2020
    Configuration menu
    Copy the full SHA
    269de0d View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2020

  1. move script watching from ControllerScriptEngineBase to child classes 

    Removing scripts from the file system watcher should not be done in the
shutdown method because this prevents reloading an invalid script that
has been fixed.
    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    d72618f View commit details
    Browse the repository at this point in the history

  2. ControllerScriptEngineLegacy: stop watching old script files

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    d677f4b View commit details
    Browse the repository at this point in the history

  3. remove class names from debug messages 

    This is error prone when renaming the classes. Also, the log should be
identified by the logging category.
    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    5b02715 View commit details
    Browse the repository at this point in the history

  4. Controller: remove unnecessary local variable

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    424c94b View commit details
    Browse the repository at this point in the history

  5. HSS1394 & Bulk controllers: don't use QByteArray::fromRawData 

    These Controller subclasses both run their own threads for receiving
data fromt the controller, so it is not safe to access the data in
another thread without making a copy.
    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    d50b710 View commit details
    Browse the repository at this point in the history

  6. MidiController: formatting

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    fa8771f View commit details
    Browse the repository at this point in the history

  7. ControllerScriptEngineBase: remove superfluous QString() wrapper

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    c96a2c2 View commit details
    Browse the repository at this point in the history

  8. ControllerScriptEngineBase: make isTesting const

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    cb41ffd View commit details
    Browse the repository at this point in the history

  9. ControllerScriptEngineBase: remove obsolete friend declaration

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    a80ca2c View commit details
    Browse the repository at this point in the history

  10. ControllerScriptEngineLegacy: use std::as_const for looped container

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    f7b0ddc View commit details
    Browse the repository at this point in the history

  11. ControllerScriptEngineLegacy: reserve known list size

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    0112554 View commit details
    Browse the repository at this point in the history

  12. ControllerScriptEngineLegacy: remove undefined declaration

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    65de8c5 View commit details
    Browse the repository at this point in the history

  13. ControllerScriptEngineLegacy: remove obsolete friend class declarations

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    94d9423 View commit details
    Browse the repository at this point in the history

  14. ControllerScriptEngineLegacy: make jsEngine() hack private and const

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    388b4e3 View commit details
    Browse the repository at this point in the history

  15. ControllerScriptEngineLegacy: remove obsolete forward declarations

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    57c0219 View commit details
    Browse the repository at this point in the history

  16. ControllerScriptEngineLegacy: remove unneeded #include

    @Be-ing
    Be-ing committed Oct 25, 2020
    Configuration menu
    Copy the full SHA
    e504678 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2020

  1. ControllerScriptEngineLegacy: use QStringBuilder

    @Be-ing
    Be-ing committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    e35e90f View commit details
    Browse the repository at this point in the history

  2. fix legacy controller preset validation tests

    @Be-ing
    Be-ing committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    5b81d28 View commit details
    Browse the repository at this point in the history

  3. fix PortMidiController tests

    @Be-ing
    Be-ing committed Oct 26, 2020
    Configuration menu
    Copy the full SHA
    98d9e37 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2020

  1. Merge remote-tracking branch 'upstream/main' into controllerengine_re… 

    …factoring
    @Be-ing
    Be-ing committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    4e744e0 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2020

  1. Merge remote-tracking branch 'upstream/main' into controllerengine_re… 

    …factoring
    @Be-ing
    Be-ing committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    6a78b67 View commit details
    Browse the repository at this point in the history

  2. ControllerScriptEngineBase: add missing override

    @Be-ing
    Be-ing committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    0e6119c View commit details
    Browse the repository at this point in the history

  3. rename receiveShortMessage/Sysex -> receivedShortMessage/Sysex

    @Be-ing
    Be-ing committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    145cf8e View commit details
    Browse the repository at this point in the history

  4. ControllerScriptModuleEngine: remove input handling 

    This will be reimplemented differently in the future.
    @Be-ing
    Be-ing committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    7f2187d View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2020

  1. ControllerScriptEngineBase: remove confusing (obsolete?) comment 

    m_pJSEngine is never passed to other threads
    @Be-ing
    Be-ing committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    30692a1 View commit details
    Browse the repository at this point in the history

  2. ControllerScriptEngineBase/Legacy: use shared_ptr for QJSEngine

    @Be-ing
    Be-ing committed Nov 2, 2020
    Configuration menu
    Copy the full SHA
    86bebb6 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2020

  1. ControllerScriptEngineLegacy: rename local variable

    @Be-ing
    Be-ing committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    4227e22 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/main' into controllerengine_re… 

    …factoring
    @Be-ing
    Be-ing committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    b8e2430 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2020

  1. Merge remote-tracking branch 'upstream/main' into controllerengine_re… 

    …factoring
    @Be-ing
    Be-ing committed Nov 30, 2020
    Configuration menu
    Copy the full SHA
    20fbcb0 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2020

  1. controllers: fix clazy warnings

    @Be-ing
    Be-ing committed Dec 1, 2020
    Configuration menu
    Copy the full SHA
    b5cf59d View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2020

  1. Merge remote-tracking branch 'upstream/main' into controllerengine_re… 

    …factoring
    @Be-ing
    Be-ing committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    1911580 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2020

  1. Merge remote-tracking branch 'upstream/main' into controllerengine_re… 

    …factoring
    @Be-ing
    Be-ing committed Dec 11, 2020
    Configuration menu
    Copy the full SHA
    b5fafcc View commit details
    Browse the repository at this point in the history

  2. remove accidentally commited mixxx.log.1 file

    @Be-ing
    Be-ing committed Dec 11, 2020
    Configuration menu
    Copy the full SHA
    57b7406 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2020

  1. Merge branch 'main' of github.com:mixxxdj/mixxx into controllerengine… 

    …_refactoring
    @Holzhaus
    Holzhaus committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    3a40266 View commit details
    Browse the repository at this point in the history

  2. ControllerScriptEngineBase: Add comment regarding input handler errors

    @Holzhaus
    Holzhaus committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    221dab8 View commit details
    Browse the repository at this point in the history

  3. ControllerScriptEngineBase: Fix inverted logic in scriptErrorDialog

    @Holzhaus
    Holzhaus committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    66f447c View commit details
    Browse the repository at this point in the history

  4. ControllerScriptEngineLegacy: Abort initialization if base init failed

    @Holzhaus
    Holzhaus committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    7e770cf View commit details
    Browse the repository at this point in the history

  5. ControllerScriptEngineBase: Move JS array buffer wrapping to legacy 

    With the new engine, this should be implement in JavaScript code, e.g.
inside the MIDI dispatcher class or something like that.
    @Holzhaus
    Holzhaus committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    de29f92 View commit details
    Browse the repository at this point in the history

  6. ControllerScriptEngineLegacy: Remove temp variable for initialize() r… 

    …esult
    @Holzhaus
    Holzhaus committed Dec 17, 2020
    Configuration menu
    Copy the full SHA
    6c8cb90 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2020

  1. ControllerDebug: Clean up method names and add a way to disable testing

    @Holzhaus
    Holzhaus committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    4c95980 View commit details
    Browse the repository at this point in the history