Migrate ControllerEngine to QJSEngine + improve error handling

.travis.yml

@@ -209,6 +209,7 @@ addons:
       - portaudio19-dev
       - protobuf-compiler
       - qt5-default
+      - qtdeclarative5-dev
       - qtscript5-dev
       - qt5keychain-dev
   homebrew:

CMakeLists.txt

@@ -189,10 +189,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/control/controlpushbutton.cpp
   src/control/controlttrotary.cpp
   src/controllers/colormapper.cpp
-  src/controllers/colormapperjsproxy.cpp
   src/controllers/controller.cpp
   src/controllers/controllerdebug.cpp
-  src/controllers/controllerengine.cpp
   src/controllers/controllerenumerator.cpp
   src/controllers/controllerinputmappingtablemodel.cpp
   src/controllers/controllerlearningeventfilter.cpp
@@ -214,6 +212,10 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/controllers/dlgprefcontrollerdlg.ui
   src/controllers/dlgprefcontrollers.cpp
   src/controllers/dlgprefcontrollersdlg.ui
+  src/controllers/engine/controllerengine.cpp
+  src/controllers/engine/controllerenginejsproxy.cpp
+  src/controllers/engine/colorjsproxy.cpp
+  src/controllers/engine/colormapperjsproxy.cpp
   src/controllers/keyboard/keyboardeventfilter.cpp
   src/controllers/learningutils.cpp
   src/controllers/midi/midicontroller.cpp
@@ -1353,6 +1355,7 @@ find_package(Qt5
     Gui
     Network
     OpenGL
+    Qml
     Script
     ScriptTools
     Sql
@@ -1368,6 +1371,7 @@ target_link_libraries(mixxx-lib PUBLIC
   Qt5::Gui
   Qt5::Network
   Qt5::OpenGL
+  Qt5::Qml
   Qt5::Script
   Qt5::ScriptTools
   Qt5::Sql
@@ -1472,16 +1476,6 @@ elseif(WIN32)
   endif()
 endif()
 
-# QtScriptByteArray
-add_library(QtScriptByteArray STATIC EXCLUDE_FROM_ALL
-  lib/qtscript-bytearray/bytearrayclass.cpp
-  lib/qtscript-bytearray/bytearrayprototype.cpp
-)
-set_target_properties(QtScriptByteArray PROPERTIES AUTOMOC ON)
-target_link_libraries(QtScriptByteArray Qt5::Core)
-target_include_directories(mixxx-lib PUBLIC lib/qtscript-bytearray)
-target_link_libraries(mixxx-lib PUBLIC QtScriptByteArray)
-
 # Queen Mary DSP
 add_library(QueenMaryDsp STATIC EXCLUDE_FROM_ALL
   # lib/qm-dsp/base/KaiserWindow.cpp

appveyor.yml

@@ -88,6 +88,7 @@ for:
       protobuf-compiler
       python-pip
       qt5-default
+      qtdeclarative5-dev
       qt5keychain-dev
       qtscript5-dev
       xsltproc

build/depends.py

@@ -228,6 +228,7 @@ def enabled_modules(build):
             'QtGui',
             'QtNetwork',
             'QtOpenGL',
+            'QtQml', # Needed for QJSEngine
             'QtScript',
             'QtScriptTools',
             'QtSql',
@@ -702,14 +703,6 @@ def sources(self, build):
                 env['CCFLAGS'].remove('-ffast-math')
         return env.Object('src/util/fpclassify.cpp')
 
-class QtScriptByteArray(Dependence):
-    def configure(self, build, conf):
-        build.env.Append(CPPPATH='#lib/qtscript-bytearray')
-
-    def sources(self, build):
-        return ['lib/qtscript-bytearray/bytearrayclass.cpp',
-                'lib/qtscript-bytearray/bytearrayprototype.cpp']
-
 class PortAudioRingBuffer(Dependence):
     def configure(self, build, conf):
         build.env.Append(CPPPATH='#lib/portaudio')
@@ -743,6 +736,7 @@ def enabled(self, build):
         return True
 
     def sources(self, build):
+
         sources = ["src/control/control.cpp",
                    "src/control/controlaudiotaperpot.cpp",
                    "src/control/controlbehavior.cpp",
@@ -904,7 +898,6 @@ def sources(self, build):
 
                    "src/controllers/controller.cpp",
                    "src/controllers/controllerdebug.cpp",
-                   "src/controllers/controllerengine.cpp",
                    "src/controllers/controllerenumerator.cpp",
                    "src/controllers/controllerlearningeventfilter.cpp",
                    "src/controllers/controllermanager.cpp",
@@ -921,6 +914,10 @@ def sources(self, build):
                    "src/controllers/delegates/midibytedelegate.cpp",
                    "src/controllers/delegates/midioptionsdelegate.cpp",
                    "src/controllers/learningutils.cpp",
+                   "src/controllers/engine/controllerengine.cpp",
+                   "src/controllers/engine/controllerenginejsproxy.cpp",
+                   "src/controllers/engine/colorjsproxy.cpp",
+                   "src/controllers/engine/colormapperjsproxy.cpp",
                    "src/controllers/midi/midimessage.cpp",
                    "src/controllers/midi/midiutils.cpp",
                    "src/controllers/midi/midicontroller.cpp",
@@ -930,7 +927,6 @@ def sources(self, build):
                    "src/controllers/softtakeover.cpp",
                    "src/controllers/keyboard/keyboardeventfilter.cpp",
                    "src/controllers/colormapper.cpp",
-                   "src/controllers/colormapperjsproxy.cpp",
 
                    "src/main.cpp",
                    "src/mixxx.cpp",
@@ -1319,7 +1315,6 @@ def sources(self, build):
                    "src/util/workerthread.cpp",
                    "src/util/workerthreadscheduler.cpp"
                    ]
-
         proto_args = {
             'PROTOCPROTOPATH': ['src'],
             'PROTOCPYTHONOUTDIR': '',  # set to None to not generate python
@@ -1609,7 +1604,7 @@ def depends(self, build):
         return [SoundTouch, ReplayGain, Ebur128Mit, PortAudio, PortMIDI, Qt, TestHeaders,
                 FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf,
                 Chromaprint, RubberBand, SecurityFramework, CoreServices, IOKit,
-                QtScriptByteArray, Reverb, FpClassify, PortAudioRingBuffer, LAME,
+                Reverb, FpClassify, PortAudioRingBuffer, LAME,
                 QueenMaryDsp, Kaitai, MP3GuessEnc, RigtorpSPSCQueue]
 
     def post_dependency_check_configure(self, build, conf):