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

Changes from 1 commit
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
fed2e1b
split ControllerEngine functionality into ControllerEngineJSProxy
Be-ing Jul 6, 2020
9c04291
reorganize controller scripting code
Be-ing Jul 6, 2020
24408ab
controllers: clean up some #includes
Be-ing Jul 6, 2020
979a243
split ControllerScriptHandler into base and subclasses
Be-ing Jul 6, 2020
b3d6ff8
remove hacks for JS modules in legacy controller system
Be-ing Jul 6, 2020
72e849f
ControllerScriptEngineBase: remove outdated comment
Be-ing Jul 12, 2020
0968a9d
Controller: replace legacy NULL with nullptr
Be-ing Jul 12, 2020
77ca43f
ControllerScriptModuleEngine: keep build working with Qt < 5.12
Be-ing Jul 12, 2020
8153b3f
cleanup handling of incoming HID/USB Bulk/MIDI sysex data
Be-ing Jul 12, 2020
9363b49
MidiController: rename confusingly overloaded "receive" method
Be-ing Jul 12, 2020
e25bf12
ControllerScriptEngine: generate wrappers for input callbacks
Be-ing Jul 13, 2020
e8e2487
HIDController: avoid deep copying input data
Be-ing Jul 13, 2020
26b51ec
Controller: pass received input QByteArray by reference
Be-ing Jul 13, 2020
e99cef3
BulkController: avoid deep copying input data
Be-ing Jul 13, 2020
f6f7050
ControllerScriptModuleEngine: pass raw ArrayBuffer to input callback
Be-ing Jul 13, 2020
b4d2d21
Hss1394Controller: fix build
Be-ing Jul 14, 2020
197c0d0
Merge remote-tracking branch 'upstream/master' into controllerengine_…
Be-ing Jul 16, 2020
62fc40c
Merge remote-tracking branch 'upstream/master' into controllerengine_…
Be-ing Sep 1, 2020
2046add
change explicit comparisons to nullptr to implicit
Be-ing Sep 1, 2020
a691d32
HSS1394Controller: replace C cast with reinterpret_cast
Be-ing Sep 1, 2020
487f8f9
ControllerScriptEngineLegacy: make iterator const
Be-ing Sep 1, 2020
2b6eb9f
rename ControllerScriptInterface to ControllerScriptInterfaceLegacy
Be-ing Sep 1, 2020
fa16b57
ControllerScriptInterfaceLegacy: clang-format fixes
Be-ing Sep 1, 2020
427ba5e
assert for missing ControlObjects with --controllerDebug CLI option
Be-ing Sep 1, 2020
caf3d68
remove legacy ControllerEngine file brought back from merge
Be-ing Sep 1, 2020
6c1a6b6
ControllerScriptEngineLegacy: remove QString initialization to ""
Be-ing Sep 1, 2020
df4f377
ControllerScriptEngineBase: fix typo in comment
Be-ing Sep 2, 2020
8ec7ed8
fix ControllerEngine tests
Be-ing Sep 2, 2020
0d39501
rename ControllerEngineTest to ControllerScriptEngineLegacyTest
Be-ing Sep 2, 2020
13f86a5
ControllerScriptEngineLegacyTest clang-format fixes
Be-ing Sep 2, 2020
e028e3e
Merge remote-tracking branch 'upstream/master' into controllerengine_…
Be-ing Oct 5, 2020
5c1ace9
Merge remote-tracking branch 'upstream/main' into controllerengine_re…
Be-ing Oct 24, 2020
bdf497b
ControllerScriptEngineBase: make m_scriptWatcher private
Be-ing Oct 24, 2020
3383aef
ControllerScriptEngineBase: don't call virtual destructor
Be-ing Oct 24, 2020
19b9aaf
ControllerScriptEngineBase: fix removing files from watcher
Be-ing Oct 24, 2020
4505c86
ControllerScriptEngineBase: pass QFileInfo& to watchScriptFile
Be-ing Oct 24, 2020
95b83ea
make ControllerScriptEngine classes' constructors explicit
Be-ing Oct 24, 2020
e4bdfdd
mark child classes' destructors override
Be-ing Oct 24, 2020
269de0d
ControllerScriptEngineBase: log error when unable to watch file
Be-ing Oct 24, 2020
d72618f
move script watching from ControllerScriptEngineBase to child classes
Be-ing Oct 25, 2020
d677f4b
ControllerScriptEngineLegacy: stop watching old script files
Be-ing Oct 25, 2020
5b02715
remove class names from debug messages
Be-ing Oct 25, 2020
424c94b
Controller: remove unnecessary local variable
Be-ing Oct 25, 2020
d50b710
HSS1394 & Bulk controllers: don't use QByteArray::fromRawData
Be-ing Oct 25, 2020
fa8771f
MidiController: formatting
Be-ing Oct 25, 2020
c96a2c2
ControllerScriptEngineBase: remove superfluous QString() wrapper
Be-ing Oct 25, 2020
cb41ffd
ControllerScriptEngineBase: make isTesting const
Be-ing Oct 25, 2020
a80ca2c
ControllerScriptEngineBase: remove obsolete friend declaration
Be-ing Oct 25, 2020
f7b0ddc
ControllerScriptEngineLegacy: use std::as_const for looped container
Be-ing Oct 25, 2020
0112554
ControllerScriptEngineLegacy: reserve known list size
Be-ing Oct 25, 2020
65de8c5
ControllerScriptEngineLegacy: remove undefined declaration
Be-ing Oct 25, 2020
94d9423
ControllerScriptEngineLegacy: remove obsolete friend class declarations
Be-ing Oct 25, 2020
388b4e3
ControllerScriptEngineLegacy: make jsEngine() hack private and const
Be-ing Oct 25, 2020
57c0219
ControllerScriptEngineLegacy: remove obsolete forward declarations
Be-ing Oct 25, 2020
e504678
ControllerScriptEngineLegacy: remove unneeded #include
Be-ing Oct 25, 2020
e35e90f
ControllerScriptEngineLegacy: use QStringBuilder
Be-ing Oct 25, 2020
5b81d28
fix legacy controller preset validation tests
Be-ing Oct 26, 2020
98d9e37
fix PortMidiController tests
Be-ing Oct 26, 2020
4e744e0
Merge remote-tracking branch 'upstream/main' into controllerengine_re…
Be-ing Oct 29, 2020
6a78b67
Merge remote-tracking branch 'upstream/main' into controllerengine_re…
Be-ing Oct 30, 2020
0e6119c
ControllerScriptEngineBase: add missing override
Be-ing Oct 30, 2020
145cf8e
rename receiveShortMessage/Sysex -> receivedShortMessage/Sysex
Be-ing Oct 30, 2020
7f2187d
ControllerScriptModuleEngine: remove input handling
Be-ing Oct 30, 2020
30692a1
ControllerScriptEngineBase: remove confusing (obsolete?) comment
Be-ing Nov 1, 2020
86bebb6
ControllerScriptEngineBase/Legacy: use shared_ptr for QJSEngine
Be-ing Nov 2, 2020
4227e22
ControllerScriptEngineLegacy: rename local variable
Be-ing Nov 3, 2020
b8e2430
Merge remote-tracking branch 'upstream/main' into controllerengine_re…
Be-ing Nov 3, 2020
20fbcb0
Merge remote-tracking branch 'upstream/main' into controllerengine_re…
Be-ing Nov 30, 2020
b5cf59d
controllers: fix clazy warnings
Be-ing Dec 1, 2020
1911580
Merge remote-tracking branch 'upstream/main' into controllerengine_re…
Be-ing Dec 8, 2020
b5fafcc
Merge remote-tracking branch 'upstream/main' into controllerengine_re…
Be-ing Dec 11, 2020
57b7406
remove accidentally commited mixxx.log.1 file
Be-ing Dec 11, 2020
3a40266
Merge branch 'main' of github.com:mixxxdj/mixxx into controllerengine…
Holzhaus Dec 17, 2020
221dab8
ControllerScriptEngineBase: Add comment regarding input handler errors
Holzhaus Dec 17, 2020
66f447c
ControllerScriptEngineBase: Fix inverted logic in scriptErrorDialog
Holzhaus Dec 17, 2020
7e770cf
ControllerScriptEngineLegacy: Abort initialization if base init failed
Holzhaus Dec 17, 2020
de29f92
ControllerScriptEngineBase: Move JS array buffer wrapping to legacy
Holzhaus Dec 17, 2020
6c8cb90
ControllerScriptEngineLegacy: Remove temp variable for initialize() r…
Holzhaus Dec 17, 2020
4c95980
ControllerDebug: Clean up method names and add a way to disable testing
Holzhaus Dec 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ QJSValue ControllerScriptEngineLegacy::wrapFunctionCode(
}

bool ControllerScriptEngineLegacy::initialize() {
ControllerScriptEngineBase::initialize();
const bool success = ControllerScriptEngineBase::initialize();
if (!success) {
Holzhaus marked this conversation as resolved.
Show resolved Hide resolved
return false;
}

// Make this ControllerScriptHandler instance available to scripts as 'engine'.
QJSValue engineGlobalObject = m_pJSEngine->globalObject();
Expand Down