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

migrate legacy controller system to QJSEngine #2682

Merged
merged 169 commits into from
Jun 14, 2020
Merged

migrate legacy controller system to QJSEngine #2682

merged 169 commits into from
Jun 14, 2020

Commits on Nov 24, 2018

  1. Replace QtScript classes with QtQml script classes 

    Don't bind "this" in beginTimer and makeConnection callbacks

Adapt ControllerEngine::checkException for QJSEngine

Rename checkException to handleEvaluationException
    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    e2441bd View commit details
    Browse the repository at this point in the history

  2. Move controllerengine files into new engine subfolder

    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    8e21856 View commit details
    Browse the repository at this point in the history

  3. Expose Controller and ControllerEngine scripting apis through a proxy 

    Since QJSEngine takes ownership of exposed QObjects it tried to delete
controller and controllerengine when QJSEngine was destroyed (i.e script reload
and mixxx shutdown). See https://bugreports.qt.io/browse/QTBUG-41171

This also has the benefit that we have a tighter control on what's exposed.
Since Signals and slots, properties and children of object are available
as properties of the created QJSValue, lots of undesired things were leaked
into the JS engine.
    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    3bf236a View commit details
    Browse the repository at this point in the history

  4. Add checks for JS engine evaluation errors

    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    08dd110 View commit details
    Browse the repository at this point in the history

  5. Remove unused evaluate slot in ControllerEngine

    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    6ddae3d View commit details
    Browse the repository at this point in the history

  6. Refactor exceptions

    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    9b3b28f View commit details
    Browse the repository at this point in the history

  7. Add nullengine exception handling

    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    50f8059 View commit details
    Browse the repository at this point in the history

  8. Fix tests build

    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    2b14555 View commit details
    Browse the repository at this point in the history

  9. Add controller script name to assertion message 

    This helps inspecting the test results in eclipse test inspector.
    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    a3475d8 View commit details
    Browse the repository at this point in the history

  10. Fix script error not displaying file name

    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    9009fc9 View commit details
    Browse the repository at this point in the history

  11. Remove comment

    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    d7b6811 View commit details
    Browse the repository at this point in the history

  12. Adapt hid devices to new JS Engine 

    Remove bytearrayclass since now QJSEngine has built in support for
QByteArray, which gets converted to a JS ArrayBuffer.
    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    6bd1f15 View commit details
    Browse the repository at this point in the history

  13. Add QtQml dependency to travis config file

    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    4047bf8 View commit details
    Browse the repository at this point in the history

  14. Update comments

    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    5ed5280 View commit details
    Browse the repository at this point in the history

  15. Remove QScriptEngineDebugger from SkinContext

    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    b3380ba View commit details
    Browse the repository at this point in the history

  16. Components: use Function.prototype.bind for QJSEngine 

    The old hacks for preserving the "this" object for
engine.makeConnection, engine.connectControl, and
engine.beginTimer do not work with QJSEngine, but QJSEngine
brings support for ES5, which supports Function.prototype.bind.
https://bugs.launchpad.net/mixxx/+bug/1733666
    @Be-ing
    Be-ing committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    6274220 View commit details
    Browse the repository at this point in the history

  17. Xone K2: use Function.prototype.bind for QJSEngine 

    The old	hacks for preserving the "this" object for
engine.makeConnection, engine.connectControl, and
engine.beginTimer do not work with QJSEngine, but QJSEngine
brings support for ES5,	which supports Function.prototype.bind.
https://bugs.launchpad.net/mixxx/+bug/1733666
    @Be-ing
    Be-ing committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    ed4b00c View commit details
    Browse the repository at this point in the history

  18. Hercules P32: use Function.prototype.bind for QJSEngine 

    The old	hacks for preserving the "this" object for
engine.makeConnection, engine.connectControl, and
engine.beginTimer do not work with QJSEngine, but QJSEngine
brings support for ES5,	which supports Function.prototype.bind.
https://bugs.launchpad.net/mixxx/+bug/1733666
    @Be-ing
    Be-ing committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    ccbc73c View commit details
    Browse the repository at this point in the history

  19. Add comment to depends.py

    @ferranpujolcamins
    ferranpujolcamins committed Nov 24, 2018
    Configuration menu
    Copy the full SHA
    eb06da4 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2018

  1. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    1200db3 View commit details
    Browse the repository at this point in the history

  2. Add missing file to depends.py

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    9143bb3 View commit details
    Browse the repository at this point in the history

  3. Fix usage of deprecated parameter

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    7c65f81 View commit details
    Browse the repository at this point in the history

  4. Replace checks with VERIFY_OR_DEBUG_ASSERT

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    c34427d View commit details
    Browse the repository at this point in the history

  5. Replace tabs with spaces

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    630c781 View commit details
    Browse the repository at this point in the history

  6. Rename ControllerEngine member

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    da214be View commit details
    Browse the repository at this point in the history

  7. Replace tabs with spaces

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    4bee8ab View commit details
    Browse the repository at this point in the history

  8. Rename function in ControllerEngine

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    98818df View commit details
    Browse the repository at this point in the history

  9. Rename variable

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    86efb47 View commit details
    Browse the repository at this point in the history

  10. Improve comments

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    b69b9b9 View commit details
    Browse the repository at this point in the history

  11. Rename method in ControllerEngine

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    cf40beb View commit details
    Browse the repository at this point in the history

  12. Let subclasses of Controller provide custom JS api 

    Add MidiControllerJSProxy
    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    d572eb1 View commit details
    Browse the repository at this point in the history

  13. Remove redundant warning

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    8521131 View commit details
    Browse the repository at this point in the history

  14. Replace tabs with spaces

    @ferranpujolcamins
    ferranpujolcamins committed Nov 25, 2018
    Configuration menu
    Copy the full SHA
    d9013e8 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2018

  1. Rename MidiController member

    @ferranpujolcamins
    ferranpujolcamins committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    85b7855 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    d6d86e8 View commit details
    Browse the repository at this point in the history

  3. Add missing Q_OBJECT macro 

    Co-Authored-By: ferranpujolcamins <ferranpujolcamins@gmail.com>
    @Be-ing @ferranpujolcamins
    Be-ing and ferranpujolcamins authored Nov 27, 2018
    Configuration menu
    Copy the full SHA
    bd58277 View commit details
    Browse the repository at this point in the history

  4. Add missing Q_OBJECT macro 

    Co-Authored-By: ferranpujolcamins <ferranpujolcamins@gmail.com>
    @Be-ing @ferranpujolcamins
    Be-ing and ferranpujolcamins authored Nov 27, 2018
    Configuration menu
    Copy the full SHA
    f6291d7 View commit details
    Browse the repository at this point in the history

  5. Add HidControllerJSProxy

    @ferranpujolcamins
    ferranpujolcamins committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    6f5dfd2 View commit details
    Browse the repository at this point in the history

  6. Make Controller::send virtual 

    This is needed so BulkController can reuse the JSProxy from Controller and still have a custom implementation of send called from JS.

Rename of send(QByteArray) to sendByteArray was needed because it's private and can't be imported by the using clausule.
    @ferranpujolcamins
    ferranpujolcamins committed Nov 27, 2018
    2 Configuration menu
    Copy the full SHA
    e8e25a4 View commit details
    Browse the repository at this point in the history

  7. Remove unused method of ControllerEngine

    @ferranpujolcamins
    ferranpujolcamins committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    70b16f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2018

  1. Centralise script evaluation handling 

    Remove exceptions in ControllerEngine
Remove hasErrors(QString) method of ControllerEngine
    @ferranpujolcamins
    ferranpujolcamins committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    a353c34 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    06ad456 View commit details
    Browse the repository at this point in the history

  3. Remove close button from script error dialog 

    It did nothing, just like the retry button.
    @ferranpujolcamins
    ferranpujolcamins committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    8da5220 View commit details
    Browse the repository at this point in the history

  4. Fix the retry button of the script error dialog 

    It was actually doing nothing before.
    @ferranpujolcamins
    ferranpujolcamins committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    e804155 View commit details
    Browse the repository at this point in the history

  5. Fix typo in comment 

    Co-Authored-By: ferranpujolcamins <ferranpujolcamins@gmail.com>
    @Pegasus-RPG @ferranpujolcamins
    Pegasus-RPG and ferranpujolcamins authored Nov 29, 2018
    Configuration menu
    Copy the full SHA
    ad2e814 View commit details
    Browse the repository at this point in the history

  6. Revert renaming of send(QByteArray) to sendByteArray

    @ferranpujolcamins
    ferranpujolcamins committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    11c7508 View commit details
    Browse the repository at this point in the history

  7. Fix method hiding warning in FakeController

    @ferranpujolcamins
    ferranpujolcamins committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    ca59d2d View commit details
    Browse the repository at this point in the history

  8. Fix connectionExecutesWithCorrectThisObject test

    @ferranpujolcamins
    ferranpujolcamins committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    3053d2e View commit details
    Browse the repository at this point in the history

  9. Check precondition of showScriptExceptionDialog(QJSValue)

    @ferranpujolcamins
    ferranpujolcamins committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    fb54489 View commit details
    Browse the repository at this point in the history

  10. Add warnings when m_pScriptEngine is null

    @ferranpujolcamins
    ferranpujolcamins committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    77d2372 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2018

  1. Revert "Add warnings when m_pScriptEngine is null" 

    This reverts commit 77d2372.
    @ferranpujolcamins
    ferranpujolcamins committed Nov 30, 2018
    Configuration menu
    Copy the full SHA
    733e7b0 View commit details
    Browse the repository at this point in the history

  2. Rename evaluateProgram to evaluateCodeString

    Ferran Pujol Camins committed Nov 30, 2018
    Configuration menu
    Copy the full SHA
    c0c3268 View commit details
    Browse the repository at this point in the history

  3. Add missing override

    Ferran Pujol Camins committed Nov 30, 2018
    Configuration menu
    Copy the full SHA
    1170b0b View commit details
    Browse the repository at this point in the history

  4. Delete ControllerEngine::isReady()

    Ferran Pujol Camins committed Nov 30, 2018
    Configuration menu
    Copy the full SHA
    a003f1f View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2018

  1. Merge pull request #5 from Be-ing/update_scripts_for_qjsengine 

    Update scripts for QJSEngine
    @ferranpujolcamins
    ferranpujolcamins authored Dec 1, 2018
    Configuration menu
    Copy the full SHA
    2cfa4bc View commit details
    Browse the repository at this point in the history

  2. showScriptExceptionDialog inside evaluateCodeString

    @ferranpujolcamins
    ferranpujolcamins committed Dec 1, 2018
    Configuration menu
    Copy the full SHA
    0ab3fee View commit details
    Browse the repository at this point in the history

  3. Rename internalExecute and remove execute methods

    @ferranpujolcamins
    ferranpujolcamins committed Dec 1, 2018
    Configuration menu
    Copy the full SHA
    907d9df View commit details
    Browse the repository at this point in the history

  4. Remove internalExecute methods

    @ferranpujolcamins
    ferranpujolcamins committed Dec 1, 2018
    Configuration menu
    Copy the full SHA
    17cb8eb View commit details
    Browse the repository at this point in the history

  5. Update comments

    @ferranpujolcamins
    ferranpujolcamins committed Dec 1, 2018
    Configuration menu
    Copy the full SHA
    183eb08 View commit details
    Browse the repository at this point in the history

  6. Fix log message

    @ferranpujolcamins
    ferranpujolcamins committed Dec 1, 2018
    Configuration menu
    Copy the full SHA
    70ed3c9 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2018

  1. Add script error dialog on executeFunction and ScriptConnection

    @ferranpujolcamins
    ferranpujolcamins committed Dec 2, 2018
    Configuration menu
    Copy the full SHA
    e0295ad View commit details
    Browse the repository at this point in the history

  2. Remove controllerengineexceptions.h

    @ferranpujolcamins
    ferranpujolcamins committed Dec 2, 2018
    Configuration menu
    Copy the full SHA
    3337dfd View commit details
    Browse the repository at this point in the history

  3. Don't open new error dialogs when there's already one 

    This way we prevent a flood of dialogs if something is wrong. The user can always see all the errors in the logs.
    @ferranpujolcamins
    ferranpujolcamins committed Dec 2, 2018
    Configuration menu
    Copy the full SHA
    aa28540 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2018

  1. Rename variable

    @ferranpujolcamins
    ferranpujolcamins committed Dec 8, 2018
    Configuration menu
    Copy the full SHA
    80263a9 View commit details
    Browse the repository at this point in the history

  2. Evaluate timer callback strings on beginTimer

    @ferranpujolcamins
    ferranpujolcamins committed Dec 8, 2018
    Configuration menu
    Copy the full SHA
    075664d View commit details
    Browse the repository at this point in the history

  3. Avoid recalculation of m_byteArrayToScriptValueJSFunction

    @ferranpujolcamins
    ferranpujolcamins committed Dec 8, 2018
    Configuration menu
    Copy the full SHA
    bd2185a View commit details
    Browse the repository at this point in the history

  4. Remove m_bPopups

    @ferranpujolcamins
    ferranpujolcamins committed Dec 8, 2018
    Configuration menu
    Copy the full SHA
    4fa82f7 View commit details
    Browse the repository at this point in the history

  5. Add missing function in header file

    @ferranpujolcamins
    ferranpujolcamins committed Dec 8, 2018
    Configuration menu
    Copy the full SHA
    b57ef7b View commit details
    Browse the repository at this point in the history

  6. Fix controller scripts

    @ferranpujolcamins
    ferranpujolcamins committed Dec 8, 2018
    Configuration menu
    Copy the full SHA
    49e01ed View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Dec 8, 2018
    Configuration menu
    Copy the full SHA
    2deded5 View commit details
    Browse the repository at this point in the history

  8. Patch novation launchpad generated scripts

    @ferranpujolcamins
    ferranpujolcamins committed Dec 8, 2018
    Configuration menu
    Copy the full SHA
    f2f04d2 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2018

  1. Add QtQml to linux appveyor config

    @ferranpujolcamins
    ferranpujolcamins committed Dec 9, 2018
    Configuration menu
    Copy the full SHA
    90d6770 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2018

  1. remove 'use strict' from Novation Launchpad scripts 

    Somehow this is broken with Qt 5.12 and QJSEngine. I am not
sure if the bug is in Qt or the scripts.
    @Be-ing
    Be-ing committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    ecedd59 View commit details
    Browse the repository at this point in the history

  2. Components.js: remove dependency on Lodash 

    Lodash's assign function is no longer needed with Object.assign in ES6
with Qt 5.12. The ComponentContainer.applyLayer function ended up not
being used and only confused people, so it is being removed instead of
rewriting it to not Lodash.
    @Be-ing
    Be-ing committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    a4c198b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into qjsengine_migration

    @Be-ing
    Be-ing committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    c2ebe26 View commit details
    Browse the repository at this point in the history

  4. remove controller scripts' dependency on Lodash 

    The Numark N4 script required a handful of changes and will need testing
by someone who has that controller.
    @Be-ing
    Be-ing committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    28497ba View commit details
    Browse the repository at this point in the history

  5. remove Lodash 

    It is no longer needed with ES7 in Qt 5.12.
    @Be-ing
    Be-ing committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    fa6393b View commit details
    Browse the repository at this point in the history

  6. Merge pull request #6 from Be-ing/qjsengine_migration 

    fix scripts for Qt 5.12
    @ferranpujolcamins
    ferranpujolcamins authored Dec 28, 2018
    Configuration menu
    Copy the full SHA
    99f9f36 View commit details
    Browse the repository at this point in the history

  7. Throw QJSEngine exceptions on evaluation failure of callbacks

    @ferranpujolcamins
    ferranpujolcamins committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    619b1df View commit details
    Browse the repository at this point in the history

  8. Remove warning in ControllerEngine

    @ferranpujolcamins
    ferranpujolcamins committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    4e1d544 View commit details
    Browse the repository at this point in the history

  9. Improve ControllerEngine error messages

    @ferranpujolcamins
    ferranpujolcamins committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    454d1ed View commit details
    Browse the repository at this point in the history

  10. make ControllerEngine throw an errorr on faulty makeConnection callback

    @ferranpujolcamins
    ferranpujolcamins committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    6740331 View commit details
    Browse the repository at this point in the history

  11. make ControllerEngine throw an errorr on faulty makeConnection callback

    @ferranpujolcamins
    ferranpujolcamins committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    d3c5f65 View commit details
    Browse the repository at this point in the history

  12. Fix build error in ControllerEngine

    @ferranpujolcamins
    ferranpujolcamins committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    11f4be3 View commit details
    Browse the repository at this point in the history

  13. Display controller name on ControllerEngine script error dialog

    @ferranpujolcamins
    ferranpujolcamins committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    ac6b3ba View commit details
    Browse the repository at this point in the history

  14. Correct message on ControllerEngine script error dialog

    @ferranpujolcamins
    ferranpujolcamins committed Dec 28, 2018
    Configuration menu
    Copy the full SHA
    8906c5d View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2018

  1. Improve ControllerEngine error message on callbacks 

    Also, Report errors thrown when calling the init function.
    @ferranpujolcamins
    ferranpujolcamins committed Dec 29, 2018
    Configuration menu
    Copy the full SHA
    b845529 View commit details
    Browse the repository at this point in the history

  2. use function pointers for Qt connections in ControllerEngine

    @Be-ing
    Be-ing committed Dec 29, 2018
    Configuration menu
    Copy the full SHA
    191ce6f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7 from Be-ing/qjsengine_migration 

    use function pointers for Qt connections in ControllerEngine
    @ferranpujolcamins
    ferranpujolcamins authored Dec 29, 2018
    Configuration menu
    Copy the full SHA
    bb885fb View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2018

  1. Add alternative to QJSEngine::throwError for QT < 5.12.0

    @ferranpujolcamins
    ferranpujolcamins committed Dec 30, 2018
    Configuration menu
    Copy the full SHA
    2d2bac7 View commit details
    Browse the repository at this point in the history

  2. Check presets for compatibility with ControllerEngine version

    @ferranpujolcamins
    ferranpujolcamins committed Dec 30, 2018
    Configuration menu
    Copy the full SHA
    9158b50 View commit details
    Browse the repository at this point in the history

  3. Correct engine version

    @ferranpujolcamins
    ferranpujolcamins committed Dec 30, 2018
    Configuration menu
    Copy the full SHA
    3a00f84 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2018

  1. Revert "remove Lodash" 

    This reverts commit fa6393b.
    @ferranpujolcamins
    ferranpujolcamins committed Dec 31, 2018
    Configuration menu
    Copy the full SHA
    76f4b77 View commit details
    Browse the repository at this point in the history

  2. Revert "remove controller scripts' dependency on Lodash" 

    This reverts commit 28497ba.
    @ferranpujolcamins
    ferranpujolcamins committed Dec 31, 2018
    Configuration menu
    Copy the full SHA
    e14c247 View commit details
    Browse the repository at this point in the history

  3. Revert "Components.js: remove dependency on Lodash" 

    This reverts commit a4c198b.
    @ferranpujolcamins
    ferranpujolcamins committed Dec 31, 2018
    Configuration menu
    Copy the full SHA
    996df30 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Dec 31, 2018
    Configuration menu
    Copy the full SHA
    8eeb00f View commit details
    Browse the repository at this point in the history

  5. Add comment on ControllerEngine version

    @ferranpujolcamins
    ferranpujolcamins committed Dec 31, 2018
    Configuration menu
    Copy the full SHA
    de53702 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2019

  1. Disable apply and accept buttons when loading an incompatible mapping

    @ferranpujolcamins
    ferranpujolcamins committed Jan 2, 2019
    Configuration menu
    Copy the full SHA
    c7dd4db View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2019

  1. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    059e6a3 View commit details
    Browse the repository at this point in the history

  2. Disconnect DlgPreferences::changePage before deleting controller dele… 

    …gates

Fixes crash on shutdown with preferences pane open
    @ferranpujolcamins
    ferranpujolcamins committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    3ca5bfd View commit details
    Browse the repository at this point in the history

  3. Replace Qt foreach macro with standard C++11 for loop

    @ferranpujolcamins
    ferranpujolcamins committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    c1d34f9 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2019

  1. Use new signals and slots syntax in DlgPrefControllers 

    Remove obsolete QSignalMapper and use a lambda instead.
    @ferranpujolcamins
    ferranpujolcamins committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    299fcfd View commit details
    Browse the repository at this point in the history

  2. Hide unsupported mapping warning when controller is disabled

    @ferranpujolcamins
    ferranpujolcamins committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    98ffee1 View commit details
    Browse the repository at this point in the history

  3. Mixtrack Platinum: use Function.prototype.bind for QJSEngine

    @Be-ing
    Be-ing committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    9058f5f View commit details
    Browse the repository at this point in the history

  4. Numark N4: use Function.prototype.bind for QJSEngine

    @Be-ing
    Be-ing committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    718f971 View commit details
    Browse the repository at this point in the history

  5. Pioneer DDJ-SB2: use Function.prototype.bind for QJSEngine

    @Be-ing
    Be-ing committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    8bd4ad9 View commit details
    Browse the repository at this point in the history

  6. fix script validation tests failing with nonexistent COs

    @Be-ing
    Be-ing committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    72cd1ca View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2019

  1. Add FakeControllerJSProxy 

    And other improvements
    @Be-ing @ferranpujolcamins
    Be-ing authored and ferranpujolcamins committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    a7a7bdb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into migrate-to-QJSEngine 

    # Conflicts:
#	appveyor.yml
    @ferranpujolcamins
    ferranpujolcamins committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    e5916c1 View commit details
    Browse the repository at this point in the history

  3. Fix beginTimer trying to evaluate the result of an evaluation 

    Improve error message
    @ferranpujolcamins
    ferranpujolcamins committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    d5a980e View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2019

  1. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    e622a07 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2019

  1. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    cc13e7c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    60ac314 View commit details
    Browse the repository at this point in the history

  3. Fix merge and simplify tests

    @ferranpujolcamins
    ferranpujolcamins committed Feb 17, 2019
    Configuration menu
    Copy the full SHA
    431c40a View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2019

  1. add bundles

    @dszakallas
    dszakallas committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    1df12b1 View commit details
    Browse the repository at this point in the history

  2. add sources

    @dszakallas
    dszakallas committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    276f0dc View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2019

  1. Merge pull request #10 from dszakallas/upgrade-lp 

    update Novation Launchpad controller scripts
    @ferranpujolcamins
    ferranpujolcamins authored Mar 2, 2019
    Configuration menu
    Copy the full SHA
    f2610e3 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2019

  1. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    c86cc16 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    ab78036 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2019

  1. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    db6aadc View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2019

  1. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    e1a1b71 View commit details
    Browse the repository at this point in the history

  2. Remove mixco based controlelr scripts 

    They are not compatible with the new engine. We have waited for a
long time but the author could find the time to fix the issue.
    @ferranpujolcamins
    ferranpujolcamins committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    803d1cb View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2019

  1. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    eb62363 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2019

  1. Merge branch 'master' into migrate-to-QJSEngine 

    # Conflicts:
#	build/depends.py
#	res/controllers/mixco/maudio_xponent.mixco.litcoffee
    @ferranpujolcamins
    ferranpujolcamins committed Oct 23, 2019
    Configuration menu
    Copy the full SHA
    2c4936a View commit details
    Browse the repository at this point in the history

  2. Format code

    @ferranpujolcamins
    ferranpujolcamins committed Oct 23, 2019
    Configuration menu
    Copy the full SHA
    0f50ff6 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2020

  1. Merge branch 'master' into migrate-to-QJSEngine

    @ferranpujolcamins
    ferranpujolcamins committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    a17bdf8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into migrate-to-QJSEngine 

    # Conflicts:
#	build/depends.py
#	src/controllers/hid/hidcontroller.cpp
#	src/controllers/hid/hidcontroller.h
    @ferranpujolcamins
    ferranpujolcamins committed Jan 19, 2020
    Configuration menu
    Copy the full SHA
    9cdf435 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. Merge branch 'master' into migrate-to-QJSEngine 

    # Conflicts:
#	appveyor.yml
#	build/depends.py
#	res/controllers/midi-components-0.0.js
#	src/controllers/controller.h
#	src/controllers/controllerengine.h
#	src/controllers/engine/colorjsproxy.cpp
#	src/controllers/engine/controllerengine.cpp
#	src/controllers/hid/hidcontroller.cpp
#	src/preferences/dialog/dlgpreferences.cpp
#	src/preferences/dialog/dlgpreferences.h
#	src/skin/skincontext.cpp
#	src/skin/skincontext.h
#	src/test/controller_preset_validation_test.cpp
#	src/test/controllerengine_test.cpp
    Ferran Pujol Camins committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    155f066 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into migrate-to-QJSEngine 

    # Conflicts:
#	src/preferences/dialog/dlgpreferencesdlg.ui
    Ferran Pujol Camins committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    cfc4142 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2020

  1. controllers/bulk: Fix BulkController constructor

    @Holzhaus
    Holzhaus committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    e122b79 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2020

  1. Merge pull request #15 from Holzhaus/bulk-controller-fix 

    controllers/bulk: Fix BulkController constructor
    @ferranpujolcamins
    ferranpujolcamins authored Apr 12, 2020
    Configuration menu
    Copy the full SHA
    97d5623 View commit details
    Browse the repository at this point in the history

  2. Fix wrong file path in scons

    @ferranpujolcamins
    ferranpujolcamins committed Apr 12, 2020
    Configuration menu
    Copy the full SHA
    381214a View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2020

  1. Merge branch 'master' of github.com:mixxxdj/mixxx into migrate-to-QJS… 

    …Engine
    @Holzhaus
    Holzhaus committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    9b658d1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'migrate-to-QJSEngine' of https://github.com/ferranpujol… 

    …camins/mixxx into migrate-to-QJSEngine
    @Holzhaus
    Holzhaus committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    863b59c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:mixxxdj/mixxx into migrate-to-QJS… 

    …Engine
    @Holzhaus
    Holzhaus committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    e5984a6 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2020

  1. ColorMapper(JSProxy): port to QJSEngine/QJSValue API

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

  2. MidiControllerPreset/HidControllerPreset: add missing 'override's

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

  3. Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

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

  4. ControllerMapperJSProxyTest: remove tests we can't test anymore 

    Unfortunately the QJSEngine API does not provide any way to give
a pointer to the QJSEngine to QObjects inserted into the JS
environment, so there is no way to throw JS errors from the
JSProxy classes.
    @Be-ing
    Be-ing committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    b65729e View commit details
    Browse the repository at this point in the history

  5. ControllerMapperJSProxy: prevent segfault with default constructor

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

  6. controllers: allow scripts to work without XML mappings 

    as discussed on Zulip
https://mixxx.zulipchat.com/#narrow/stream/113295-controller-mapping/topic/Removal.20of.20MIDI.20XML/near/194557547
    @Be-ing
    Be-ing committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    2aa0433 View commit details
    Browse the repository at this point in the history

  7. MidiControllerTest: fix segfault

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

  8. ColorMapperJSProxy: remove hack for string-indexed maps

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

Commits on Apr 22, 2020

  1. Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

    @Be-ing
    Be-ing committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    44f11ef View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2020

  1. Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

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

  2. Revert "controllers: allow scripts to work without XML mappings" 

    This reverts commit 2aa0433.

Hacking this into the legacy Controller system to use modern
JavaScript turns out to not be a great idea. It will be better
to rewrite the whole controller system from scratch.
    @Be-ing
    Be-ing committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    3970b4e View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

    @Be-ing
    Be-ing committed May 7, 2020
    Configuration menu
    Copy the full SHA
    00feedc View commit details
    Browse the repository at this point in the history

  2. Roland DJ 505: use Function.prototype.bind for QJSEngine 

    The old hacks for preserving the "this" object for
engine.makeConnection, engine.connectControl, and
engine.beginTimer do not work with QJSEngine, but QJSEngine
brings support for ES5, which supports Function.prototype.bind.
https://bugs.launchpad.net/mixxx/+bug/1733666
    @Be-ing
    Be-ing committed May 7, 2020
    Configuration menu
    Copy the full SHA
    4b297dd View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

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

Commits on May 19, 2020

  1. Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

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

Commits on May 20, 2020

  1. Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

    @Be-ing
    Be-ing committed May 20, 2020
    Configuration menu
    Copy the full SHA
    e1896f8 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. controllers: assorted code cleanup

    @Be-ing
    Be-ing committed May 27, 2020
    Configuration menu
    Copy the full SHA
    3130882 View commit details
    Browse the repository at this point in the history

  2. ControllerEngine: assorted code cleanup

    @Be-ing
    Be-ing committed May 27, 2020
    Configuration menu
    Copy the full SHA
    4b43d25 View commit details
    Browse the repository at this point in the history

  3. remove "controller engine version" concept 

    This was introduced in PR mixxxdj#1795 when the migration to QJSEngine was
planned for a release when the latest Ubuntu version shipped Qt 5.9,
which did not support ES7. The purpose was to show users an error when
they loaded a script using ES7 if they were using a Qt version before
5.12. Since Mixxx 2.3 took so long, the QJSEngine migration will be
released when the latest Ubuntu LTS (20.04) ships Qt 5.12, so we do not
need to introduce this "controller engine version" concept anymore.

Mixxx will still build and run with Qt < 5.12 at the small cost of
keeping only one #if in ControllerEngine::throwJSError, but mappings
using ES7, which now includes any mapping using the Components library,
will not work.
    @Be-ing
    Be-ing committed May 27, 2020
    Configuration menu
    Copy the full SHA
    ec1d9aa View commit details
    Browse the repository at this point in the history

  4. move ScriptConnection & ScriptConnectionJSProxy to their own files

    @Be-ing
    Be-ing committed May 27, 2020
    Configuration menu
    Copy the full SHA
    68b6330 View commit details
    Browse the repository at this point in the history

  5. ControllerEngine: cleaup comments and code formatting 

    Comments that merely repeat the information in the function signature
are not documentation, they are noise.
    @Be-ing
    Be-ing committed May 27, 2020
    Configuration menu
    Copy the full SHA
    98bc040 View commit details
    Browse the repository at this point in the history

  6. ControllerEngine: reorganize method order

    @Be-ing
    Be-ing committed May 27, 2020
    Configuration menu
    Copy the full SHA
    18aaec7 View commit details
    Browse the repository at this point in the history

  7. disable JS JIT compilation for Qt >= 5.14.0 to work around Qt bug

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

  8. Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

    @Be-ing
    Be-ing committed May 27, 2020
    Configuration menu
    Copy the full SHA
    4af2051 View commit details
    Browse the repository at this point in the history

  9. fix SCons build

    @Be-ing
    Be-ing committed May 27, 2020
    Configuration menu
    Copy the full SHA
    214ae8e View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

    @Be-ing
    Be-ing committed May 27, 2020
    Configuration menu
    Copy the full SHA
    ec51aff View commit details
    Browse the repository at this point in the history

  11. DlgPrefController: break long line

    @Be-ing
    Be-ing committed May 27, 2020
    Configuration menu
    Copy the full SHA
    ccbe088 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. disable QV4_FORCE_INTERPRETER for Qt 5.15.1 

    The crashing bug QV4_FORCE_INTERPRETER worked around will be fixed in Qt
5.15.1 (tested by compiling the Qt 5.15 Git branch).
https://bugreports.qt.io/browse/QTBUG-84363?focusedCommentId=513892&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-513892
    @Be-ing
    Be-ing committed May 28, 2020
    Configuration menu
    Copy the full SHA
    48952ad View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

    @Be-ing
    Be-ing committed May 28, 2020
    Configuration menu
    Copy the full SHA
    ca1e353 View commit details
    Browse the repository at this point in the history

  3. fix disconnection of ScriptConnectionJSProxy by connectControl

    @Be-ing
    Be-ing committed May 28, 2020
    Configuration menu
    Copy the full SHA
    469eda7 View commit details
    Browse the repository at this point in the history

  4. try to fix Hss1394Controller build

    @Be-ing
    Be-ing committed May 28, 2020
    Configuration menu
    Copy the full SHA
    91bc471 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2020

  1. Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine

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

  2. ColorMapper: fixes from PR mixxxdj#2733 

    Somehow this got lost in a merge.
    @Be-ing
    Be-ing committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    d596ded View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2020

  1. Components: fix HotcueButton color output

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