Yikai Lu
2017-08-07 17:18:35 UTC
vlmc | branch: master | Yikai Lu <***@gmail.com> | Tue Aug 8 01:32:00 2017 +0900| [4fc8e2f0ab46ebf37a4e24dd3d4b5ef91421a95c] | committer: Yikai Lu
Clip.qml: Correctly update length
src/Gui/timeline/Clip.qml | 5 +++++
src/Gui/timeline/main.qml | 1 +
2 files changed, 6 insertions(+)
diff --git a/src/Gui/timeline/Clip.qml b/src/Gui/timeline/Clip.qml
index 3ab9da69..b6b79ead 100644
--- a/src/Gui/timeline/Clip.qml
+++ b/src/Gui/timeline/Clip.qml
@@ -158,6 +158,7 @@ Rectangle {
position = clipInfo["position"];
begin = clipInfo["begin"];
end = clipInfo["end"];
+ length = clipInfo["length"];
}
onPositionChanged: {
@@ -172,6 +173,10 @@ Rectangle {
clipInfo["end"] = end;
}
+ onLengthChanged: {
+ clipInfo["length"] = length;
+ }
+
onSelectedChanged: {
if ( selected === true ) {
selectedClips.push( uuid );
diff --git a/src/Gui/timeline/main.qml b/src/Gui/timeline/main.qml
index 96b827e7..c801939a 100644
--- a/src/Gui/timeline/main.qml
+++ b/src/Gui/timeline/main.qml
@@ -739,6 +739,7 @@ Rectangle {
clip.lastPosition = clipInfo["position"];
clip.end = clipInfo["end"];
clip.begin = clipInfo["begin"];
+ clip.length = clipInfo["length"];
clip.updateEffects( clipInfo );
}
Clip.qml: Correctly update length
https://code.videolan.org/videolan/vlmc/commit/4fc8e2f0ab46ebf37a4e24dd3d4b5ef91421a95c
---src/Gui/timeline/Clip.qml | 5 +++++
src/Gui/timeline/main.qml | 1 +
2 files changed, 6 insertions(+)
diff --git a/src/Gui/timeline/Clip.qml b/src/Gui/timeline/Clip.qml
index 3ab9da69..b6b79ead 100644
--- a/src/Gui/timeline/Clip.qml
+++ b/src/Gui/timeline/Clip.qml
@@ -158,6 +158,7 @@ Rectangle {
position = clipInfo["position"];
begin = clipInfo["begin"];
end = clipInfo["end"];
+ length = clipInfo["length"];
}
onPositionChanged: {
@@ -172,6 +173,10 @@ Rectangle {
clipInfo["end"] = end;
}
+ onLengthChanged: {
+ clipInfo["length"] = length;
+ }
+
onSelectedChanged: {
if ( selected === true ) {
selectedClips.push( uuid );
diff --git a/src/Gui/timeline/main.qml b/src/Gui/timeline/main.qml
index 96b827e7..c801939a 100644
--- a/src/Gui/timeline/main.qml
+++ b/src/Gui/timeline/main.qml
@@ -739,6 +739,7 @@ Rectangle {
clip.lastPosition = clipInfo["position"];
clip.end = clipInfo["end"];
clip.begin = clipInfo["begin"];
+ clip.length = clipInfo["length"];
clip.updateEffects( clipInfo );
}