fixed build

Author: mkalkbrenner

.github/workflows/ci.yml

@@ -80,7 +80,11 @@ jobs:
           export HOMEBREW_NO_ENV_HINTS=1
           export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
           brew install --force-bottle qt opencv
-          echo "CMAKE_PREFIX_PATH=$(brew --prefix qt)" >> "$GITHUB_ENV"
+          QT_PREFIX=$(brew --prefix qt 2>/dev/null || brew --prefix qt@6 2>/dev/null || true)
+          if [ -n "$QT_PREFIX" ]; then
+            echo "CMAKE_PREFIX_PATH=$QT_PREFIX" >> "$GITHUB_ENV"
+            echo "Qt6_DIR=$QT_PREFIX/lib/cmake/Qt6" >> "$GITHUB_ENV"
+          fi
           echo "OpenCV_DIR=$(brew --prefix opencv)/lib/cmake/opencv4" >> "$GITHUB_ENV"
 
       - if: matrix.platform == 'macos'

app/MainWindow.cpp

@@ -1544,6 +1544,13 @@ MainWindow::MainWindow(QWidget* parent)
     m_previewFastForwardButton = new QToolButton(playbackControls);
     m_previewFastForwardButton->setText("Fwd");
     m_previewFastForwardButton->setToolTip("Jump forward 10 frames while playing");
+    m_playbackOverrideDurationCheck = new QCheckBox("Fixed", playbackControls);
+    m_playbackOverrideDurationCheck->setToolTip("Override frame duration during playback");
+    m_playbackOverrideDurationSpin = new QSpinBox(playbackControls);
+    m_playbackOverrideDurationSpin->setRange(1, 10000);
+    m_playbackOverrideDurationSpin->setValue(33);
+    m_playbackOverrideDurationSpin->setSuffix(" ms");
+    m_playbackOverrideDurationSpin->setEnabled(false);
     playbackControlsLayout->addStretch(1);
     playbackControlsLayout->addWidget(m_previewRewindButton);
     playbackControlsLayout->addWidget(m_previewPrevButton);
@@ -1552,6 +1559,9 @@ MainWindow::MainWindow(QWidget* parent)
     playbackControlsLayout->addWidget(m_previewStopButton);
     playbackControlsLayout->addWidget(m_previewNextButton);
     playbackControlsLayout->addWidget(m_previewFastForwardButton);
+    playbackControlsLayout->addSpacing(12);
+    playbackControlsLayout->addWidget(m_playbackOverrideDurationCheck);
+    playbackControlsLayout->addWidget(m_playbackOverrideDurationSpin);
     playbackControlsLayout->addStretch(1);
     playbackControls->setLayout(playbackControlsLayout);
     playbackLayout->addWidget(playbackControls, 0, Qt::AlignHCenter);
@@ -4355,6 +4365,35 @@ MainWindow::MainWindow(QWidget* parent)
     connect(m_previewFastForwardButton, &QToolButton::clicked, this, [this]() {
         stepPlayback(10);
     });
+    connect(m_playbackOverrideDurationCheck, &QCheckBox::toggled, this, [this](bool enabled) {
+        if (!m_playbackOverrideDurationSpin) {
+            return;
+        }
+        m_playbackOverrideDurationSpin->setEnabled(enabled);
+        if (m_playbackActive) {
+            if (enabled) {
+                m_playbackFrameDurationMs = m_playbackOverrideDurationSpin->value();
+            } else if (m_playbackFrameIndex >= 0 &&
+                       m_playbackFrameIndex < static_cast<int>(m_frameDurations.size()) &&
+                       m_frameDurations[m_playbackFrameIndex] > 0) {
+                m_playbackFrameDurationMs = static_cast<int>(m_frameDurations[m_playbackFrameIndex]);
+            } else {
+                m_playbackFrameDurationMs = 30;
+            }
+            m_playbackFrameClock.restart();
+            schedulePlaybackTick();
+        }
+    });
+    connect(m_playbackOverrideDurationSpin, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int value) {
+        if (!m_playbackOverrideDurationCheck || !m_playbackOverrideDurationCheck->isChecked()) {
+            return;
+        }
+        if (m_playbackActive) {
+            m_playbackFrameDurationMs = value;
+            m_playbackFrameClock.restart();
+            schedulePlaybackTick();
+        }
+    });
     connect(m_previewRefreshButton, &QToolButton::clicked, this, [this]() {
         refreshAllPreviews();
     });
@@ -5896,6 +5935,10 @@ void MainWindow::renderPlaybackFrame()
             m_playbackFrameDurationMs = duration;
         }
     }
+    if (m_playbackOverrideDurationCheck && m_playbackOverrideDurationCheck->isChecked() &&
+        m_playbackOverrideDurationSpin) {
+        m_playbackFrameDurationMs = m_playbackOverrideDurationSpin->value();
+    }
     m_playbackUseHd = m_useHdFrame && hasHdFrame(frameIndex);
     m_playbackRotationData = rotationBlockForRead(frameIndex, m_playbackUseHd);
     m_playbackBase565.clear();
@@ -6045,6 +6088,14 @@ void MainWindow::updatePlaybackButtons()
     if (m_previewFastForwardButton) {
         m_previewFastForwardButton->setEnabled(hasFrames);
     }
+    if (m_playbackOverrideDurationCheck) {
+        m_playbackOverrideDurationCheck->setEnabled(hasFrames);
+    }
+    if (m_playbackOverrideDurationSpin) {
+        const bool enabled = hasFrames && m_playbackOverrideDurationCheck &&
+            m_playbackOverrideDurationCheck->isChecked();
+        m_playbackOverrideDurationSpin->setEnabled(enabled);
+    }
 }
 
 void MainWindow::updatePreviewsForMaskId(int maskId)

app/MainWindow.h

@@ -591,6 +591,8 @@ class MainWindow : public QMainWindow
     class QToolButton* m_previewNextButton = nullptr;
     class QToolButton* m_previewRewindButton = nullptr;
     class QToolButton* m_previewFastForwardButton = nullptr;
+    class QCheckBox* m_playbackOverrideDurationCheck = nullptr;
+    class QSpinBox* m_playbackOverrideDurationSpin = nullptr;
     bool m_playbackActive = false;
     bool m_playbackPaused = false;
     bool m_playbackUseHd = false;

handbook.md

@@ -23,6 +23,7 @@ This handbook captures editor behaviors and workflows that differ from the legac
 - Use the rotate toggle to preview color rotations in the preview row.
 - Use the refresh button to rebuild previews after bulk edits.
 - Use Play/Pause/Stop/Prev/Next/Rew/Fwd in the Playback tab to test-play the selected frames (or the whole ROM if none or only one frame is selected). A single selected frame becomes the start point.
+- Playback can override per-frame durations using the `Fixed` control (milliseconds) in the Playback tab.
 
 ## Canvas Controls