Revert set zone out to include current frame

parent 8a847684
Pipeline #16417 passed with stage
in 22 minutes and 16 seconds
......@@ -682,13 +682,9 @@ void Monitor::slotSetZoneStart()
checkOverlay();
}
void Monitor::slotSetZoneEnd(bool discardLastFrame)
void Monitor::slotSetZoneEnd()
{
Q_UNUSED(discardLastFrame);
int pos = m_glMonitor->getCurrentPos();
if (m_controller) {
pos++;
}
int pos = m_glMonitor->getCurrentPos() + 1;
m_glMonitor->getControllerProxy()->setZoneOut(pos);
if (m_controller) {
m_controller->setZone(m_glMonitor->getControllerProxy()->zone());
......
......@@ -297,7 +297,7 @@ public slots:
void slotStart();
void slotEnd();
void slotSetZoneStart();
void slotSetZoneEnd(bool discardLastFrame = false);
void slotSetZoneEnd();
void slotZoneStart();
void slotZoneEnd();
void slotLoadClipZone(const QPoint &zone);
......
......@@ -578,9 +578,6 @@ void MonitorManager::slotSetOutPoint()
if (m_activeMonitor == m_clipMonitor) {
m_clipMonitor->slotSetZoneEnd();
} else if (m_activeMonitor == m_projectMonitor) {
// NOT anymore: Zone end behaves slightly differently in clip monitor and timeline monitor.
// in timeline, set zone end selects the frame before current cursor, but in clip monitor
// it selects frame at current cursor position.
m_projectMonitor->slotSetZoneEnd();
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment