Traktor s3, main branch

CMakeLists.txt

@@ -1472,6 +1472,7 @@ add_executable(mixxx-test
   src/test/metadatatest.cpp
   src/test/metaknob_link_test.cpp
   src/test/midicontrollertest.cpp
+  src/test/controllers/Traktor_Kontrol_S3_test.cpp
   src/test/mixxxtest.cpp
   src/test/movinginterquartilemean_test.cpp
   src/test/nativeeffects_test.cpp

src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp

@@ -250,6 +250,14 @@ bool ControllerScriptEngineLegacy::evaluateScriptFile(const QFileInfo& scriptFil
     return true;
 }
 
+QJSValue ControllerScriptEngineLegacy::evaluateCodeString(
+        const QString& program, const QString& fileName, int lineNumber) {
+    VERIFY_OR_DEBUG_ASSERT(m_pJSEngine) {
+        return QJSValue::UndefinedValue;
+    }
+    return m_pJSEngine->evaluate(program, fileName, lineNumber);
+}
+
 QJSValue ControllerScriptEngineLegacy::wrapArrayBufferCallback(const QJSValue& callback) {
     return m_makeArrayBufferWrapperFunction.call(QJSValueList{callback});
 }

src/controllers/scripting/legacy/controllerscriptenginelegacy.h

@@ -31,8 +31,14 @@ class ControllerScriptEngineLegacy : public ControllerScriptEngineBase {
         m_scriptFiles = scripts;
     }
 
-  private:
+  protected:
+    friend class ControllerTest;
     bool evaluateScriptFile(const QFileInfo& scriptFile);
+    QJSValue evaluateCodeString(const QString& program,
+            const QString& fileName = QString(),
+            int lineNumber = 1);
+
+  private:
     void shutdown() override;
 
     QJSValue wrapArrayBufferCallback(const QJSValue& callback);