Commit 7f02835d authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch 'master' of invent.kde.org:multimedia/kdenlive

parents 32717056 81d83a72
Pipeline #80932 failed with stage
in 32 seconds
......@@ -4432,6 +4432,9 @@ void MainWindow::slotActivateVideoTrackSequence()
int trackPos = qBound(0, action->data().toInt(), trackIds.count() - 1);
int tid = trackIds.at(trackIds.count() - 1 - trackPos);
getCurrentTimeline()->controller()->setActiveTrack(tid);
if (m_activeTool == ToolType::MulticamTool) {
pCore->monitorManager()->slotPerformMultiTrackMode();
}
}
void MainWindow::slotActivateTarget()
......
......@@ -345,6 +345,7 @@ void MonitorManager::slotForwardOneSecond()
void MonitorManager::slotStartMultiTrackMode()
{
getAction(QStringLiteral("monitor_multitrack"))->setEnabled(false);
m_activeMultiTrack = pCore->window()->getCurrentTimeline()->controller()->activeTrack();
pCore->window()->getCurrentTimeline()->controller()->setMulticamIn(m_projectMonitor->position());
}
......@@ -354,6 +355,7 @@ void MonitorManager::slotStopMultiTrackMode()
if (m_activeMultiTrack == -1) {
return;
}
getAction(QStringLiteral("monitor_multitrack"))->setEnabled(true);
pCore->window()->getCurrentTimeline()->controller()->setMulticamIn(-1);
m_activeMultiTrack = -1;
}
......
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