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
cddb3bfa
Commit
cddb3bfa
authored
May 02, 2020
by
Jean-Baptiste Mardelle
Browse files
Add new option to merge all audio streams when using multi stream clip
Don't reload clip on audio channel change (fixed in MLT > 6.20)
parent
0404ced4
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/bin/projectclip.cpp
View file @
cddb3bfa
...
...
@@ -963,7 +963,7 @@ void ProjectClip::setProperties(const QMap<QString, QString> &properties, bool r
};
QStringList
forceReloadProperties
{
QStringLiteral
(
"autorotate"
),
QStringLiteral
(
"templatetext"
),
QStringLiteral
(
"resource"
),
QStringLiteral
(
"force_fps"
),
QStringLiteral
(
"set.test_image"
),
QStringLiteral
(
"set.test_audio"
),
QStringLiteral
(
"audio_index"
),
QStringLiteral
(
"video_index"
)};
QStringLiteral
(
"video_index"
)};
QStringList
keys
{
QStringLiteral
(
"luma_duration"
),
QStringLiteral
(
"luma_file"
),
QStringLiteral
(
"fade"
),
QStringLiteral
(
"ttl"
),
QStringLiteral
(
"softness"
),
QStringLiteral
(
"crop"
),
QStringLiteral
(
"animation"
)};
QVector
<
int
>
updateRoles
;
...
...
src/mltcontroller/clippropertiescontroller.cpp
View file @
cddb3bfa
...
...
@@ -618,7 +618,10 @@ ClipPropertiesController::ClipPropertiesController(ClipController *controller, Q
i
.
next
();
audioStream
->
addItem
(
QString
(
"%1: %2"
).
arg
(
i
.
key
()).
arg
(
i
.
value
()),
i
.
key
());
}
if
(
!
vix
.
isEmpty
()
&&
vix
.
toInt
()
>
-
1
)
{
if
(
audioStream
->
count
()
>
1
)
{
audioStream
->
addItem
(
i18n
(
"Merge all streams"
),
INT_MAX
);
}
if
(
!
vix
.
isEmpty
()
&&
vix
.
toInt
()
!=
-
1
)
{
audioStream
->
setCurrentIndex
(
audioStream
->
findData
(
QVariant
(
vix
)));
}
ac
->
setActive
(
vix
.
toInt
()
==
-
1
);
...
...
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