Skip to content
GitLab
Menu
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
b08e92bc
Commit
b08e92bc
authored
Nov 15, 2021
by
Jean-Baptiste Mardelle
Browse files
Fix display of timeline usage in clip monitor
parent
bdfa69d7
Pipeline
#97815
passed with stage
in 9 minutes and 29 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/bin/projectclip.cpp
View file @
b08e92bc
...
...
@@ -96,11 +96,10 @@ ProjectClip::ProjectClip(const QString &id, const QIcon &thumb, const std::share
}
// Make sure we have a hash for this clip
hash
();
m_boundaryTimer
.
setSingleShot
(
true
);
m_boundaryTimer
.
setInterval
(
500
);
if
(
m_hasLimitedDuration
)
{
connect
(
&
m_boundaryTimer
,
&
QTimer
::
timeout
,
this
,
&
ProjectClip
::
refreshBounds
);
m_boundaryTimer
.
setSingleShot
(
true
);
m_boundaryTimer
.
setInterval
(
500
);
}
connect
(
m_markerModel
.
get
(),
&
MarkerListModel
::
modelChanged
,
this
,
[
&
]()
{
setProducerProperty
(
QStringLiteral
(
"kdenlive:markers"
),
m_markerModel
->
toJson
());
...
...
@@ -162,6 +161,8 @@ ProjectClip::ProjectClip(const QString &id, const QDomElement &description, cons
}
else
{
m_name
=
i18n
(
"Untitled"
);
}
m_boundaryTimer
.
setSingleShot
(
true
);
m_boundaryTimer
.
setInterval
(
500
);
connect
(
m_markerModel
.
get
(),
&
MarkerListModel
::
modelChanged
,
this
,
[
&
]()
{
setProducerProperty
(
QStringLiteral
(
"kdenlive:markers"
),
m_markerModel
->
toJson
());
});
}
...
...
@@ -555,8 +556,6 @@ bool ProjectClip::setProducer(std::shared_ptr<Mlt::Producer> producer)
emit
refreshPropertiesPanel
();
if
(
m_hasLimitedDuration
)
{
connect
(
&
m_boundaryTimer
,
&
QTimer
::
timeout
,
this
,
&
ProjectClip
::
refreshBounds
);
m_boundaryTimer
.
setSingleShot
(
true
);
m_boundaryTimer
.
setInterval
(
500
);
}
else
{
disconnect
(
&
m_boundaryTimer
,
&
QTimer
::
timeout
,
this
,
&
ProjectClip
::
refreshBounds
);
}
...
...
src/monitor/monitorproxy.cpp
View file @
b08e92bc
...
...
@@ -440,7 +440,7 @@ QByteArray MonitorProxy::getUuid() const
void
MonitorProxy
::
updateClipBounds
(
QVector
<
QPoint
>
bounds
)
{
if
(
bounds
==
m_clipBounds
)
{
if
(
bounds
.
size
()
==
m_boundsCount
)
{
// Enforce refresh, in/out points may have changed
m_boundsCount
=
0
;
emit
clipBoundsChanged
();
...
...
src/timeline2/model/clipmodel.cpp
View file @
b08e92bc
...
...
@@ -248,9 +248,9 @@ bool ClipModel::requestResize(int size, bool right, Fun &undo, Fun &redo, bool l
}
}
}
if
(
logUndo
&&
!
m_endlessResize
)
{
emit
pCore
->
clipInstanceResized
(
m_binClipId
);
}
}
if
(
logUndo
&&
!
m_endlessResize
)
{
emit
pCore
->
clipInstanceResized
(
m_binClipId
);
}
return
true
;
}
...
...
@@ -296,9 +296,9 @@ bool ClipModel::requestResize(int size, bool right, Fun &undo, Fun &redo, bool l
}
}
}
if
(
logUndo
&&
!
m_endlessResize
)
{
emit
pCore
->
clipInstanceResized
(
m_binClipId
);
}
}
if
(
logUndo
&&
!
m_endlessResize
)
{
emit
pCore
->
clipInstanceResized
(
m_binClipId
);
}
return
true
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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