[vlmc-devel] MainWorkflow: Fix wrong uuid given by libraryClipInfo
Yikai Lu
git at videolan.org
Mon Jul 10 12:16:37 CEST 2017
vlmc | branch: master | Yikai Lu <luyikei.qmltu at gmail.com> | Mon Jul 10 17:59:43 2017 +0900| [1cd4fb1f2fedafe9f1de26070e69dbbe0d6020b9] | committer: Yikai Lu
MainWorkflow: Fix wrong uuid given by libraryClipInfo
I don't know why this happend... So shameful
> https://code.videolan.org/videolan/vlmc/commit/1cd4fb1f2fedafe9f1de26070e69dbbe0d6020b9
---
src/Gui/timeline/Track.qml | 2 +-
src/Workflow/MainWorkflow.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Gui/timeline/Track.qml b/src/Gui/timeline/Track.qml
index c40dede6..26bb7c0a 100644
--- a/src/Gui/timeline/Track.qml
+++ b/src/Gui/timeline/Track.qml
@@ -169,7 +169,7 @@ Item {
}
else {
var newClipInfo = workflow.libraryClipInfo( drag.getDataAsString( "vlmc/uuid" ) );
- currentUuid = "" + newClipInfo["libraryUuid"];
+ currentUuid = "" + newClipInfo["uuid"];
newClipInfo["position"] = ptof( drag.x );
if ( newClipInfo["audio"] ) {
newClipInfo["uuid"] = "audioUuid";
diff --git a/src/Workflow/MainWorkflow.cpp b/src/Workflow/MainWorkflow.cpp
index 9e53048a..46fd62ed 100644
--- a/src/Workflow/MainWorkflow.cpp
+++ b/src/Workflow/MainWorkflow.cpp
@@ -241,7 +241,7 @@ MainWorkflow::libraryClipInfo( const QString& uuid )
h["video"] = c->media()->hasVideoTracks();
h["begin"] = c->begin();
h["end"] = c->end();
- h["uuid"] = "libraryUuid";
+ h["uuid"] = c->uuid().toString();
return QJsonObject::fromVariantHash( h );
}
More information about the Vlmc-devel
mailing list