fixup! feat: improve screen rendering framework

mixxxdj · Oct 17, 2024 · c6fd897 · c6fd897
1 parent 0fafde2
commit c6fd897
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 95 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2789,7 +2789,7 @@ if(QML)
     src/qml/qmlvisibleeffectsmodel.cpp
     src/qml/qmlchainpresetmodel.cpp
     src/qml/qmlwaveformoverview.cpp
-    src/qml/qmlmixxxcontroller.cpp
+    src/qml/qmlmixxxcontrollerscreen.cpp
     # The following sources need to be in this target to get QML_ELEMENT properly interpreted
     src/control/controlmodel.cpp
     src/control/controlsortfiltermodel.cpp
@@ -2801,7 +2801,7 @@ if(QML)
   # and :/mixxx.org/imports/Mixxx/Controls are placed into beginning of the binary
   qt_finalize_target(mixxx)
 
-  # Required for src/qml/qmlmixxxcontroller.h, used in controllerscriptenginelegacy_test.cpp
+  # Required for src/qml/qmlmixxxcontrollerscreen.h, used in controllerscriptenginelegacy_test.cpp
   target_link_libraries(mixxx-test PRIVATE Qt6::Quick)
 
   install(

diff --git a/src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp b/src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp
@@ -17,7 +17,7 @@
 #include "mixer/playermanager.h"
 #include "moc_controllerscriptenginelegacy.cpp"
 #ifdef MIXXX_USE_QML
-#include "qml/qmlmixxxcontroller.h"
+#include "qml/qmlmixxxcontrollerscreen.h"
 #include "util/assert.h"
 #include "util/cmdlineargs.h"
 

diff --git a/src/qml/qmlmixxxcontroller.cpp b/src/qml/qmlmixxxcontroller.cpp
diff --git a/src/qml/qmlmixxxcontroller.h b/src/qml/qmlmixxxcontroller.h
diff --git a/src/test/controllerscriptenginelegacy_test.cpp b/src/test/controllerscriptenginelegacy_test.cpp
@@ -21,7 +21,7 @@
 #include "controllers/softtakeover.h"
 #include "helpers/log_test.h"
 #include "preferences/usersettings.h"
-#include "qml/qmlmixxxcontroller.h"
+#include "qml/qmlmixxxcontrollerscreen.h"
 #include "test/mixxxtest.h"
 #include "util/color/colorpalette.h"
 #include "util/time.h"