Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
5ff5d451
Commit
5ff5d451
authored
Mar 08, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix tests
parent
b91baadc
Pipeline
#16174
canceled with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/project/projectmanager.cpp
View file @
5ff5d451
...
...
@@ -858,6 +858,8 @@ bool ProjectManager::updateTimeline(int pos, int scrollPos)
return
false
;
}
m_mainTimelineModel
=
TimelineItemModel
::
construct
(
pCore
->
getProjectProfile
(),
m_project
->
getGuideModel
(),
m_project
->
commandStack
());
// Add snap point at projec start
m_mainTimelineModel
->
addSnap
(
0
);
pCore
->
window
()
->
getMainTimeline
()
->
setModel
(
m_mainTimelineModel
,
pCore
->
monitorManager
()
->
projectMonitor
()
->
getControllerProxy
());
if
(
!
constructTimelineFromMelt
(
m_mainTimelineModel
,
tractor
,
m_progressDialog
))
{
//TODO: act on project load failure
...
...
src/timeline2/model/timelinemodel.cpp
View file @
5ff5d451
...
...
@@ -130,7 +130,6 @@ TimelineModel::TimelineModel(Mlt::Profile *profile, std::weak_ptr<DocUndoStack>
m_blackClip
->
set
(
"set.test_audio"
,
0
);
m_blackClip
->
set_in_and_out
(
0
,
TimelineModel
::
seekDuration
);
m_tractor
->
insert_track
(
*
m_blackClip
,
0
);
m_snaps
->
addPoint
(
0
);
TRACE_CONSTR
(
this
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment