-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
migrate legacy controller system to QJSEngine #2682
Merged
Merged
Changes from 1 commit
Commits
Show all changes
169 commits
Select commit
Hold shift + click to select a range
e2441bd
Replace QtScript classes with QtQml script classes
ferranpujolcamins 8e21856
Move controllerengine files into new engine subfolder
ferranpujolcamins 3bf236a
Expose Controller and ControllerEngine scripting apis through a proxy
ferranpujolcamins 08dd110
Add checks for JS engine evaluation errors
ferranpujolcamins 6ddae3d
Remove unused evaluate slot in ControllerEngine
ferranpujolcamins 9b3b28f
Refactor exceptions
ferranpujolcamins 50f8059
Add nullengine exception handling
ferranpujolcamins 2b14555
Fix tests build
ferranpujolcamins a3475d8
Add controller script name to assertion message
ferranpujolcamins 9009fc9
Fix script error not displaying file name
ferranpujolcamins d7b6811
Remove comment
ferranpujolcamins 6bd1f15
Adapt hid devices to new JS Engine
ferranpujolcamins 4047bf8
Add QtQml dependency to travis config file
ferranpujolcamins 5ed5280
Update comments
ferranpujolcamins b3380ba
Remove QScriptEngineDebugger from SkinContext
ferranpujolcamins 6274220
Components: use Function.prototype.bind for QJSEngine
Be-ing ed4b00c
Xone K2: use Function.prototype.bind for QJSEngine
Be-ing ccbc73c
Hercules P32: use Function.prototype.bind for QJSEngine
Be-ing eb06da4
Add comment to depends.py
ferranpujolcamins 1200db3
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins 9143bb3
Add missing file to depends.py
ferranpujolcamins 7c65f81
Fix usage of deprecated parameter
ferranpujolcamins c34427d
Replace checks with VERIFY_OR_DEBUG_ASSERT
ferranpujolcamins 630c781
Replace tabs with spaces
ferranpujolcamins da214be
Rename ControllerEngine member
ferranpujolcamins 4bee8ab
Replace tabs with spaces
ferranpujolcamins 98818df
Rename function in ControllerEngine
ferranpujolcamins 86efb47
Rename variable
ferranpujolcamins b69b9b9
Improve comments
ferranpujolcamins cf40beb
Rename method in ControllerEngine
ferranpujolcamins d572eb1
Let subclasses of Controller provide custom JS api
ferranpujolcamins 8521131
Remove redundant warning
ferranpujolcamins d9013e8
Replace tabs with spaces
ferranpujolcamins 85b7855
Rename MidiController member
ferranpujolcamins d6d86e8
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins bd58277
Add missing Q_OBJECT macro
Be-ing f6291d7
Add missing Q_OBJECT macro
Be-ing 6f5dfd2
Add HidControllerJSProxy
ferranpujolcamins e8e25a4
Make Controller::send virtual
ferranpujolcamins 70b16f7
Remove unused method of ControllerEngine
ferranpujolcamins a353c34
Centralise script evaluation handling
ferranpujolcamins 06ad456
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins 8da5220
Remove close button from script error dialog
ferranpujolcamins e804155
Fix the retry button of the script error dialog
ferranpujolcamins ad2e814
Fix typo in comment
Pegasus-RPG 11c7508
Revert renaming of send(QByteArray) to sendByteArray
ferranpujolcamins ca59d2d
Fix method hiding warning in FakeController
ferranpujolcamins 3053d2e
Fix connectionExecutesWithCorrectThisObject test
ferranpujolcamins fb54489
Check precondition of showScriptExceptionDialog(QJSValue)
ferranpujolcamins 77d2372
Add warnings when m_pScriptEngine is null
ferranpujolcamins 733e7b0
Revert "Add warnings when m_pScriptEngine is null"
ferranpujolcamins c0c3268
Rename evaluateProgram to evaluateCodeString
1170b0b
Add missing override
a003f1f
Delete ControllerEngine::isReady()
2cfa4bc
Merge pull request #5 from Be-ing/update_scripts_for_qjsengine
ferranpujolcamins 0ab3fee
showScriptExceptionDialog inside evaluateCodeString
ferranpujolcamins 907d9df
Rename internalExecute and remove execute methods
ferranpujolcamins 17cb8eb
Remove internalExecute methods
ferranpujolcamins 183eb08
Update comments
ferranpujolcamins 70ed3c9
Fix log message
ferranpujolcamins e0295ad
Add script error dialog on executeFunction and ScriptConnection
ferranpujolcamins 3337dfd
Remove controllerengineexceptions.h
ferranpujolcamins aa28540
Don't open new error dialogs when there's already one
ferranpujolcamins 80263a9
Rename variable
ferranpujolcamins 075664d
Evaluate timer callback strings on beginTimer
ferranpujolcamins bd2185a
Avoid recalculation of m_byteArrayToScriptValueJSFunction
ferranpujolcamins 4fa82f7
Remove m_bPopups
ferranpujolcamins b57ef7b
Add missing function in header file
ferranpujolcamins 49e01ed
Fix controller scripts
ferranpujolcamins 2deded5
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins f2f04d2
Patch novation launchpad generated scripts
ferranpujolcamins 90d6770
Add QtQml to linux appveyor config
ferranpujolcamins ecedd59
remove 'use strict' from Novation Launchpad scripts
Be-ing a4c198b
Components.js: remove dependency on Lodash
Be-ing c2ebe26
Merge remote-tracking branch 'upstream/master' into qjsengine_migration
Be-ing 28497ba
remove controller scripts' dependency on Lodash
Be-ing fa6393b
remove Lodash
Be-ing 99f9f36
Merge pull request #6 from Be-ing/qjsengine_migration
ferranpujolcamins 619b1df
Throw QJSEngine exceptions on evaluation failure of callbacks
ferranpujolcamins 4e1d544
Remove warning in ControllerEngine
ferranpujolcamins 454d1ed
Improve ControllerEngine error messages
ferranpujolcamins 6740331
make ControllerEngine throw an errorr on faulty makeConnection callback
ferranpujolcamins d3c5f65
make ControllerEngine throw an errorr on faulty makeConnection callback
ferranpujolcamins 11f4be3
Fix build error in ControllerEngine
ferranpujolcamins ac6b3ba
Display controller name on ControllerEngine script error dialog
ferranpujolcamins 8906c5d
Correct message on ControllerEngine script error dialog
ferranpujolcamins b845529
Improve ControllerEngine error message on callbacks
ferranpujolcamins 191ce6f
use function pointers for Qt connections in ControllerEngine
Be-ing bb885fb
Merge pull request #7 from Be-ing/qjsengine_migration
ferranpujolcamins 2d2bac7
Add alternative to QJSEngine::throwError for QT < 5.12.0
ferranpujolcamins 9158b50
Check presets for compatibility with ControllerEngine version
ferranpujolcamins 3a00f84
Correct engine version
ferranpujolcamins 76f4b77
Revert "remove Lodash"
ferranpujolcamins e14c247
Revert "remove controller scripts' dependency on Lodash"
ferranpujolcamins 996df30
Revert "Components.js: remove dependency on Lodash"
ferranpujolcamins 8eeb00f
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins de53702
Add comment on ControllerEngine version
ferranpujolcamins c7dd4db
Disable apply and accept buttons when loading an incompatible mapping
ferranpujolcamins 059e6a3
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins 3ca5bfd
Disconnect DlgPreferences::changePage before deleting controller dele…
ferranpujolcamins c1d34f9
Replace Qt foreach macro with standard C++11 for loop
ferranpujolcamins 299fcfd
Use new signals and slots syntax in DlgPrefControllers
ferranpujolcamins 98ffee1
Hide unsupported mapping warning when controller is disabled
ferranpujolcamins 9058f5f
Mixtrack Platinum: use Function.prototype.bind for QJSEngine
Be-ing 718f971
Numark N4: use Function.prototype.bind for QJSEngine
Be-ing 8bd4ad9
Pioneer DDJ-SB2: use Function.prototype.bind for QJSEngine
Be-ing 72cd1ca
fix script validation tests failing with nonexistent COs
Be-ing a7a7bdb
Add FakeControllerJSProxy
Be-ing e5916c1
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins d5a980e
Fix beginTimer trying to evaluate the result of an evaluation
ferranpujolcamins e622a07
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins cc13e7c
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins 60ac314
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins 431c40a
Fix merge and simplify tests
ferranpujolcamins 1df12b1
add bundles
dszakallas 276f0dc
add sources
dszakallas f2610e3
Merge pull request #10 from dszakallas/upgrade-lp
ferranpujolcamins c86cc16
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins ab78036
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins db6aadc
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins e1a1b71
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins 803d1cb
Remove mixco based controlelr scripts
ferranpujolcamins eb62363
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins 2c4936a
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins 0f50ff6
Format code
ferranpujolcamins a17bdf8
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins 9cdf435
Merge branch 'master' into migrate-to-QJSEngine
ferranpujolcamins 155f066
Merge branch 'master' into migrate-to-QJSEngine
cfc4142
Merge branch 'master' into migrate-to-QJSEngine
e122b79
controllers/bulk: Fix BulkController constructor
Holzhaus 97d5623
Merge pull request #15 from Holzhaus/bulk-controller-fix
ferranpujolcamins 381214a
Fix wrong file path in scons
ferranpujolcamins 9b658d1
Merge branch 'master' of github.com:mixxxdj/mixxx into migrate-to-QJS…
Holzhaus 863b59c
Merge branch 'migrate-to-QJSEngine' of https://github.com/ferranpujol…
Holzhaus e5984a6
Merge branch 'master' of github.com:mixxxdj/mixxx into migrate-to-QJS…
Holzhaus a99fd38
ColorMapper(JSProxy): port to QJSEngine/QJSValue API
Be-ing 7949bc6
MidiControllerPreset/HidControllerPreset: add missing 'override's
Be-ing 7e47924
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Be-ing b65729e
ControllerMapperJSProxyTest: remove tests we can't test anymore
Be-ing bfbed64
ControllerMapperJSProxy: prevent segfault with default constructor
Be-ing 2aa0433
controllers: allow scripts to work without XML mappings
Be-ing 2068ce6
MidiControllerTest: fix segfault
Be-ing 5b6bea1
ColorMapperJSProxy: remove hack for string-indexed maps
Be-ing 44f11ef
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Be-ing 082908f
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Be-ing 3970b4e
Revert "controllers: allow scripts to work without XML mappings"
Be-ing 00feedc
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Be-ing 4b297dd
Roland DJ 505: use Function.prototype.bind for QJSEngine
Be-ing cb3c6f0
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Be-ing 1cbcaf7
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Be-ing e1896f8
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Be-ing 3130882
controllers: assorted code cleanup
Be-ing 4b43d25
ControllerEngine: assorted code cleanup
Be-ing ec1d9aa
remove "controller engine version" concept
Be-ing 68b6330
move ScriptConnection & ScriptConnectionJSProxy to their own files
Be-ing 98bc040
ControllerEngine: cleaup comments and code formatting
Be-ing 18aaec7
ControllerEngine: reorganize method order
Be-ing 1b777b6
disable JS JIT compilation for Qt >= 5.14.0 to work around Qt bug
Be-ing 4af2051
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Be-ing 214ae8e
fix SCons build
Be-ing ec51aff
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Be-ing ccbe088
DlgPrefController: break long line
Be-ing 48952ad
disable QV4_FORCE_INTERPRETER for Qt 5.15.1
Be-ing ca1e353
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Be-ing 469eda7
fix disconnection of ScriptConnectionJSProxy by connectControl
Be-ing 91bc471
try to fix Hss1394Controller build
Be-ing ada0929
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Be-ing d596ded
ColorMapper: fixes from PR #2733
Be-ing 6e96bdb
Components: fix HotcueButton color output
Be-ing File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Rename variable
- Loading branch information
commit 80263a9ccf9b2cd546be7fdd9987ff0b4158a9e1
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is the time stamp parameter omitted?