Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLMC
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
luyikei
VLMC
Commits
1cd4fb1f
Commit
1cd4fb1f
authored
Jul 10, 2017
by
luyikei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MainWorkflow: Fix wrong uuid given by libraryClipInfo
I don't know why this happend... So shameful
parent
eb1f07e2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
Track.qml
src/Gui/timeline/Track.qml
+1
-1
MainWorkflow.cpp
src/Workflow/MainWorkflow.cpp
+1
-1
No files found.
src/Gui/timeline/Track.qml
View file @
1cd4fb1f
...
@@ -169,7 +169,7 @@ Item {
...
@@ -169,7 +169,7 @@ Item {
}
}
else
{
else
{
var
newClipInfo
=
workflow
.
libraryClipInfo
(
drag
.
getDataAsString
(
"vlmc/uuid"
)
);
var
newClipInfo
=
workflow
.
libraryClipInfo
(
drag
.
getDataAsString
(
"vlmc/uuid"
)
);
currentUuid
=
""
+
newClipInfo
[
"
libraryU
uid"
];
currentUuid
=
""
+
newClipInfo
[
"
u
uid"
];
newClipInfo
[
"position"
]
=
ptof
(
drag
.
x
);
newClipInfo
[
"position"
]
=
ptof
(
drag
.
x
);
if
(
newClipInfo
[
"audio"
]
)
{
if
(
newClipInfo
[
"audio"
]
)
{
newClipInfo
[
"uuid"
]
=
"audioUuid"
;
newClipInfo
[
"uuid"
]
=
"audioUuid"
;
...
...
src/Workflow/MainWorkflow.cpp
View file @
1cd4fb1f
...
@@ -241,7 +241,7 @@ MainWorkflow::libraryClipInfo( const QString& uuid )
...
@@ -241,7 +241,7 @@ MainWorkflow::libraryClipInfo( const QString& uuid )
h
[
"video"
]
=
c
->
media
()
->
hasVideoTracks
();
h
[
"video"
]
=
c
->
media
()
->
hasVideoTracks
();
h
[
"begin"
]
=
c
->
begin
();
h
[
"begin"
]
=
c
->
begin
();
h
[
"end"
]
=
c
->
end
();
h
[
"end"
]
=
c
->
end
();
h
[
"uuid"
]
=
"libraryUuid"
;
h
[
"uuid"
]
=
c
->
uuid
().
toString
()
;
return
QJsonObject
::
fromVariantHash
(
h
);
return
QJsonObject
::
fromVariantHash
(
h
);
}
}
...
...
Write
Preview
Markdown
is supported
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