feat: improve screen rendering framework

mixxxdj · Oct 16, 2024 · 4576315 · 4576315
1 parent 6efbf8c
commit 4576315
Show file tree

Hide file tree

Showing 10 changed files with 167 additions and 206 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2789,6 +2789,7 @@ if(QML)
     src/qml/qmlvisibleeffectsmodel.cpp
     src/qml/qmlchainpresetmodel.cpp
     src/qml/qmlwaveformoverview.cpp
+    src/qml/qmlmixxxcontroller.cpp
     # The following sources need to be in this target to get QML_ELEMENT properly interpreted
     src/control/controlmodel.cpp
     src/control/controlsortfiltermodel.cpp

diff --git a/res/controllers/DummyDeviceDefaultScreen.qml b/res/controllers/DummyDeviceDefaultScreen.qml
@@ -13,7 +13,7 @@ import Mixxx.Controls 1.0 as MixxxControls
 
 import "." as Skin
 
-Item {
+Mixxx.Controller {
     id: root
 
     required property string screenId
@@ -23,7 +23,7 @@ Item {
     property string group: "[Channel1]"
     property var deckPlayer: Mixxx.PlayerManager.getPlayer(root.group)
 
-    function init(controlerName, isDebug) {
+    init: function(controlerName, isDebug) {
         console.log(`Screen ${root.screenId} has started`)
         switch (root.screenId) {
             case "jog":
@@ -34,13 +34,13 @@ Item {
         }
     }
 
-    function shutdown() {
+    shutdown: function() {
         console.log(`Screen ${root.screenId} is stopping`)
         loader.sourceComponent = splash
     }
 
     // function transformFrame(input: ArrayBuffer, timestamp: date) {
-    function transformFrame(input, timestamp) {
+    transformFrame: function(input, timestamp) {
         return new ArrayBuffer(0);
     }
 

diff --git a/src/controllers/controllerscreenpreview.cpp b/src/controllers/controllerscreenpreview.cpp
@@ -23,6 +23,7 @@ ControllerScreenPreview::ControllerScreenPreview(
     setMaximumWidth(screen.size.width());
     m_pStat->setAlignment(Qt::AlignRight);
     auto pLayout = make_parented<QVBoxLayout>(this);
+    pLayout->setContentsMargins(0, 0, 0, 0);
     auto* pBottomLayout = new QHBoxLayout();
     pLayout->addWidget(m_pFrame);
     pBottomLayout->addWidget(make_parented<QLabel>(

diff --git a/src/controllers/rendering/controllerrenderingengine.cpp b/src/controllers/rendering/controllerrenderingengine.cpp
@@ -375,7 +375,7 @@ void ControllerRenderingEngine::send(Controller* controller, const QByteArray& f
     DEBUG_ASSERT_THIS_QOBJECT_THREAD_AFFINITY();
     ScopedTimer t(QStringLiteral("ControllerRenderingEngine::send"));
     if (!frame.isEmpty()) {
-        controller->sendBytes(frame);
+        VERIFY_OR_TERMINATE(controller->sendBytes(frame), "Unable to send frame to device");
     }
 
     if (CmdlineArgs::Instance()