Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
259
Issues
259
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
3af486f2
Commit
3af486f2
authored
Oct 23, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctly reload mix params on project opening
parent
d8f08ed3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
+18
-3
src/assets/assetpanel.cpp
src/assets/assetpanel.cpp
+2
-2
src/timeline2/model/trackmodel.cpp
src/timeline2/model/trackmodel.cpp
+16
-1
No files found.
src/assets/assetpanel.cpp
View file @
3af486f2
...
...
@@ -54,8 +54,8 @@ AssetPanel::AssetPanel(QWidget *parent)
,
m_lay
(
new
QVBoxLayout
(
this
))
,
m_assetTitle
(
new
KSqueezedTextLabel
(
this
))
,
m_container
(
new
QWidget
(
this
))
,
m_mixWidget
(
new
MixStackView
(
this
))
,
m_transitionWidget
(
new
TransitionStackView
(
this
))
,
m_mixWidget
(
new
MixStackView
(
this
))
,
m_effectStackWidget
(
new
EffectStackView
(
this
))
{
auto
*
buttonToolbar
=
new
QToolBar
(
this
);
...
...
@@ -181,7 +181,7 @@ void AssetPanel::showMix(int cid, const std::shared_ptr<AssetParameterModel> &tr
return
;
}
clear
();
m_switchAction
->
setVisible
(
tru
e
);
m_switchAction
->
setVisible
(
fals
e
);
m_titleAction
->
setVisible
(
false
);
m_assetTitle
->
clear
();
m_mixWidget
->
setVisible
(
true
);
...
...
src/timeline2/model/trackmodel.cpp
View file @
3af486f2
...
...
@@ -2153,7 +2153,22 @@ bool TrackModel::loadMix(Mlt::Transition *t)
const
QString
assetId
(
t
->
get
(
"mlt_service"
));
std
::
unique_ptr
<
Mlt
::
Transition
>
tr
(
t
);
QDomElement
xml
=
TransitionsRepository
::
get
()
->
getXml
(
assetId
);
qDebug
()
<<
"=====
\n\n
LOADING MIX: "
<<
assetId
<<
", XML:
\n\n
"
<<
xml
.
ownerDocument
().
toString
()
<<
"
\n\n
=================="
;
// Paste parameters from existing mix
//std::unique_ptr<Mlt::Properties> sourceProperties(t);
QStringList
sourceProps
;
for
(
int
i
=
0
;
i
<
tr
->
count
();
i
++
)
{
sourceProps
<<
tr
->
get_name
(
i
);
}
QDomNodeList
params
=
xml
.
elementsByTagName
(
QStringLiteral
(
"parameter"
));
for
(
int
i
=
0
;
i
<
params
.
count
();
++
i
)
{
QDomElement
currentParameter
=
params
.
item
(
i
).
toElement
();
QString
paramName
=
currentParameter
.
attribute
(
QStringLiteral
(
"name"
));
if
(
!
sourceProps
.
contains
(
paramName
))
{
continue
;
}
QString
paramValue
=
tr
->
get
(
paramName
.
toUtf8
().
constData
());
currentParameter
.
setAttribute
(
QStringLiteral
(
"value"
),
paramValue
);
}
std
::
shared_ptr
<
AssetParameterModel
>
asset
(
new
AssetParameterModel
(
std
::
move
(
tr
),
xml
,
assetId
,
{
ObjectType
::
TimelineMix
,
cid2
},
QString
()));
m_sameCompositions
[
cid2
]
=
asset
;
m_mixList
.
insert
(
cid1
,
cid2
);
...
...
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