Commit 519b4fc0 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Multitrack tool: don't stop playing on lift operation, don't touch audio tracks

parent 25412ec4
Pipeline #78237 canceled with stage
......@@ -91,6 +91,7 @@ Item {
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton
onClicked: {
root.activateTrack(index)
controller.triggerAction('perform_multitrack_mode')
......
......@@ -3997,7 +3997,9 @@ void TimelineController::activateTrackAndSelect(int trackPosition)
if (tid > -1) {
m_activeTrack = tid;
emit activeTrackChanged();
selectCurrentItem(ObjectType::TimelineClip, true);
if (pCore->window()->getCurrentTimeline()->activeTool() != ToolType::MulticamTool) {
selectCurrentItem(ObjectType::TimelineClip, true);
}
}
}
......@@ -4713,7 +4715,7 @@ void TimelineController::processMultitrackOperation(int tid, int in)
// Lift all tracks except tid
while (it != m_model->m_allTracks.cend()) {
int target_track = (*it)->getId();
if (target_track != tid && m_model->getTrackById_const(target_track)->shouldReceiveTimelineOp()) {
if (target_track != tid && !(*it)->isAudioTrack() && m_model->getTrackById_const(target_track)->shouldReceiveTimelineOp()) {
tracks << target_track;
}
++it;
......
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